Submitting patches - git format-patch and git diff
Not directly clojure related - but input needed I have master I have mybranch I have a bunch of commits on mybranch. I can create an attributed patch with git format-patch master. This includes all commits on the branch, including merges and updates from master. I can create an unattributed but more concise diff with git diff master. I don't think that all of the commits on mybranch are particularly relevant - more steps on the way to the solution - only the final diff really matters. Questions: - is it preferred to have all commits from a branch? - even if it makes the patch harder to follow? - if a diff is preferred - how do you create one that is attributed? Thanks in advance Dave -- You received this message because you are subscribed to the Google Groups Clojure group. To post to this group, send email to clojure@googlegroups.com Note that posts from new members are moderated - please be patient with your first post. To unsubscribe from this group, send email to clojure+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/clojure?hl=en
Re: Submitting patches - git format-patch and git diff
A good answer if anyone has this issue: Having a clean history with complete/logical features is recommended. However, in development branches we can make many small commits and the history may not be clean. That's fine, as long as we clean the history before merging into master. This is where interactive rebase will help. More info here http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages thanks to Baishampayan Ghose On Wednesday, 23 May 2012 19:57:37 UTC+10, Dave Sann wrote: Not directly clojure related - but input needed I have master I have mybranch I have a bunch of commits on mybranch. I can create an attributed patch with git format-patch master. This includes all commits on the branch, including merges and updates from master. I can create an unattributed but more concise diff with git diff master. I don't think that all of the commits on mybranch are particularly relevant - more steps on the way to the solution - only the final diff really matters. Questions: - is it preferred to have all commits from a branch? - even if it makes the patch harder to follow? - if a diff is preferred - how do you create one that is attributed? Thanks in advance Dave -- You received this message because you are subscribed to the Google Groups Clojure group. To post to this group, send email to clojure@googlegroups.com Note that posts from new members are moderated - please be patient with your first post. To unsubscribe from this group, send email to clojure+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/clojure?hl=en
Re: Submitting patches - git format-patch and git diff
Dave Sann daves...@gmail.com writes: Having a clean history with complete/logical features is recommended. However, in development branches we can make many small commits and the history may not be clean. That's fine, as long as we clean the history before merging into master. You can also try to keep your branch clean directly by not merging from origin/master but rebasing your work on it: git pull vs. git pull --rebase Bye, Tassilo -- You received this message because you are subscribed to the Google Groups Clojure group. To post to this group, send email to clojure@googlegroups.com Note that posts from new members are moderated - please be patient with your first post. To unsubscribe from this group, send email to clojure+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/clojure?hl=en
