blob: 8cb3f841dac7358adea2b01e90f7ca133986219d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
Subject: Backports from master.
Use ``git cherry-pick -x SHA1''.
The ChangeLog hunk (which failed to apply) goes into ChangeLog.SHA1.
After ``tg update'' (and possibly dealing with merge conflicts), check which
can be removed:
$ for c in ChangeLog.???*; do sha1=$(expr "$c" : 'ChangeLog.\(.*\)') && git rev-list HEAD | grep -q "$sha1" && echo "$sha1 has been merged"; done
Check this, and remove the ChangeLog.SHA1.
If there are no backports, ``git diff baseline'' must only show the .top*
files on t/master_backports.
|
