Changes between Version 12 and Version 13 of MergerTips


Ignore:
Timestamp:
03/09/21 08:10:20 (19 months ago)
Author:
Mariusz Felisiak
Comment:

Update "master" to "main".

Legend:

Unmodified
Added
Removed
Modified
  • MergerTips

    v12 v13  
    2323== Automating Backports ==
    2424
    25 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.".
     25Backporting 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.".
    2626
    2727Put 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`.
    2828
    29 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`.
     29After 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`.
    3030{{{
    3131#!/bin/bash
     
    4141
    4242REV=$1
    43 : ${ORIGBRANCH=master}
     43: ${ORIGBRANCH=main}
    4444
    4545TMPFILE=tmplog.tmp
     
    5454
    5555# Create new log message by modifying the old one
    56 git log --pretty=format:"[${BRANCH_NAME}] %s%n%n%b%nBackport of ${REV} from master" HEAD^..HEAD \
     56git log --pretty=format:"[${BRANCH_NAME}] %s%n%n%b%nBackport of ${REV} from main" HEAD^..HEAD \
    5757    | grep -v '^BP$' > ${TMPFILE}
    5858
     
    9696    git co stable/1.6.x && git merge --ff-only upstream/stable/1.6.x && \
    9797    git co stable/1.5.x && git merge --ff-only upstream/stable/1.5.x && \
    98     git co master && git merge --ff-only upstream/master
     98    git co main && git merge --ff-only upstream/main
    9999}}}
    100100
Back to Top