diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-12-13 01:40:36 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-12-13 01:40:36 +0000 |
| commit | 10d8530102d59a08214531c57857ee72ce95588d (patch) | |
| tree | fd8711e00fb6daf596b7e595b2d951ff83dcf7be | |
| parent | d708f93406719d4b17d964a20fb4f790e02efac2 (diff) | |
Switch the cherry-pick merge strategy to "recursive + theirs", which
seems to pull in fewer changes and be less prone to conflitcs. This was
the case for r53086, at least. Add "-x" which adds a "cherry picked
from..." line to the commit message.
Show a diff before pushing.
svn path=/trunk/; revision=54007
| -rwxr-xr-x | tools/backport-change | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/backport-change b/tools/backport-change index e946213762..842f11b9b7 100755 --- a/tools/backport-change +++ b/tools/backport-change @@ -106,9 +106,12 @@ PUSH_CMD="git push gerrit HEAD:refs/for/$UPSTREAM_NAME" # echo "Backporting $LONG_HASH" -git cherry-pick $LONG_HASH +git cherry-pick -x --strategy=recursive -Xtheirs $LONG_HASH if [ $? -eq 0 ] ; then + echo "Running diff" + git diff + # XXX We might want to install Gerrit's commit-msg hook instead, e.g. # scp -p -P 29418 <user>@code.wireshark.org:hooks/commit-msg .git/hooks/ |