git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0244713 933cfeb)
Merge branch 'dw/subtree-split-do-not-drop-merge' into maint
authorJunio C Hamano <redacted>
Fri, 5 Feb 2016 22:54:15 +0000 (14:54 -0800)
committerJunio C Hamano <redacted>
Fri, 5 Feb 2016 22:54:15 +0000 (14:54 -0800)
commit6a65bdcc8c610b31fff6a171e6f49045c3980027
tree32a80856e49b46fdca34f0d904a2b33f5183bb8ctree | snapshot
parent0244713db17523700e97dd3573c819b51cccbcdacommit | diff
parent933cfeb90b5d03b4096db6d60494a6eedea25d03commit | diff
Merge branch 'dw/subtree-split-do-not-drop-merge' into maint

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
git clone https://git.99rst.org/PROJECT