1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-23 16:06:38 +02:00
git/contrib/subtree
Junio C Hamano dd65a9e5e3 Merge branch 'dw/subtree-split-do-not-drop-merge'
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
2016-02-03 14:16:03 -08:00
..
t contrib/subtree: fix "subtree split" skipped-merge bug 2016-01-20 14:53:18 -08:00
.gitignore subtree: add an install-html target 2014-10-15 15:17:08 -07:00
COPYING Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' 2012-04-09 20:22:55 -05:00
INSTALL Fix git-subtree install instructions 2012-04-09 22:26:19 -05:00
Makefile contrib/subtree: Make testing easier 2016-01-19 10:15:20 -08:00
README Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' 2012-04-09 20:22:55 -05:00
git-subtree.sh Merge branch 'dw/subtree-split-do-not-drop-merge' 2016-02-03 14:16:03 -08:00
git-subtree.txt contrib/subtree: there's no push --squash 2015-05-07 11:03:32 -07:00
todo contrib/subtree: remove "push" command from the "todo" file 2015-11-06 09:32:33 -08:00

Please read git-subtree.txt for documentation.

Please don't contact me using github mail; it's slow, ugly, and worst of
all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to
help.

Avery