Changes between Version 12 and Version 13 of MergerTips

Timestamp:

Mar 9, 2021, 2:10:20 AM (3 years ago)

Author:

Mariusz Felisiak

Comment:

Update "master" to "main".

MergerTips

@@ -23 +23 @@
 == 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 <full hash> 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 main.".
 
 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 <full hash of commit to backport>`. You can double check the commit message looks ok, then `git push`.
+After committing a change to main. 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
@@ -41 +41 @@
 
 REV=$1
-: ${ORIGBRANCH=master}
+: ${ORIGBRANCH=main}
 
 TMPFILE=tmplog.tmp
@@ -54 +54 @@
 
 # Create new log message by modifying the old one
-git log --pretty=format:"[${BRANCH_NAME}] %s%n%n%b%nBackport of ${REV} from master" HEAD^..HEAD \
+git log --pretty=format:"[${BRANCH_NAME}] %s%n%n%b%nBackport of ${REV} from main" HEAD^..HEAD \
     | grep -v '^BP$' > ${TMPFILE}
 
@@ -96 +96 @@
     git co stable/1.6.x && git merge --ff-only upstream/stable/1.6.x && \
     git co stable/1.5.x && git merge --ff-only upstream/stable/1.5.x && \
-    git co master && git merge --ff-only upstream/master
+    git co main && git merge --ff-only upstream/main
 }}}