![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Aug 2008 00:28:31 +0000 (17:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Aug 2008 00:28:31 +0000 (17:28 -0700) | ||
| commit | a1184d85e8752658f02746982822f43f32316803 | |
| tree | f4508ca7d63ca7e71c3e99cac4e54945f777b1aa | tree | snapshot |
| parent | 8d13caf795902812d44809e2f222fb2334030603 | commit | diff |
| parent | e596cdddf349b244dca854bf5a7aa9428b48fc50 | commit | diff |
Merge branch 'mv/merge-custom'
* mv/merge-custom:
t7606: fix custom merge test
Fix "git-merge -s bogo" help text
Update .gitignore to ignore git-help
Builtin git-help.
builtin-help: always load_command_list() in cmd_help()
Add a second testcase for handling invalid strategies in git-merge
Add a new test for using a custom merge strategy
builtin-merge: allow using a custom strategy
builtin-help: make some internal functions available to other builtins
Conflicts:
help.c
* mv/merge-custom:
t7606: fix custom merge test
Fix "git-merge -s bogo" help text
Update .gitignore to ignore git-help
Builtin git-help.
builtin-help: always load_command_list() in cmd_help()
Add a second testcase for handling invalid strategies in git-merge
Add a new test for using a custom merge strategy
builtin-merge: allow using a custom strategy
builtin-help: make some internal functions available to other builtins
Conflicts:
help.c
| Makefile | diff1 | | diff2 | | blob | history |
| builtin-merge.c | diff1 | | diff2 | | blob | history |
| t/t7600-merge.sh | diff1 | | diff2 | | blob | history |