Changes between Version 8 and Version 9 of MergerTips

Timestamp:

Oct 27, 2016, 6:49:53 AM (8 years ago)

Author:

Tim Graham

Comment:

Clarified that backports should use the full hash.

MergerTips

@@ -5 +5 @@
 == Automating Backports ==
 
-Backporting can be tedious. The following script makes it a bit easier by performing the `git cherry-pick` and modifying the commit message by prepending the branch name and appending "Backport of XXXXXXXX from master.".
+Backporting can be tedious. The following script makes it a bit easier by performing the `git cherry-pick` and modifying the commit message by prepending the branch name and appending "Backport of <full hash> from master.".
 
 Put the contents below in `django-src/backport.sh`. Add `backport.sh` to `django-src/.git/info/exclude` to prevent the file from appearing in `git status`.
 
-After committing a change to master. Switch to the branch you wish to backport to and execute `./backport <hash of commit to backport>`. You can double check the commit message looks ok, then `git push`.
+After committing a change to master. Switch to the branch you wish to backport to and execute `./backport <full hash of commit to backport>`. You can double check the commit message looks ok, then `git push`.
 {{{
 #!/bin/bash