git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc329f6 933cfeb)
Merge branch 'dw/subtree-split-do-not-drop-merge'
authorJunio C Hamano <redacted>
Wed, 3 Feb 2016 22:16:03 +0000 (14:16 -0800)
committerJunio C Hamano <redacted>
Wed, 3 Feb 2016 22:16:03 +0000 (14:16 -0800)
The "split" subcommand of "git subtree" (in contrib/) incorrectly
skipped merges when it shouldn't, which was corrected.

* dw/subtree-split-do-not-drop-merge:
  contrib/subtree: fix "subtree split" skipped-merge bug

1  2 
contrib/subtree/git-subtree.sh patch | diff1 | diff2 | blob | history

diff --cc contrib/subtree/git-subtree.sh
Simple merge
git clone https://git.99rst.org/PROJECT