diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-28 04:28:31 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-28 04:28:31 +0400 |
| commit | a1184d85e8752658f02746982822f43f32316803 (patch) | |
| tree | f4508ca7d63ca7e71c3e99cac4e54945f777b1aa /.gitignore | |
| parent | 8d13caf795902812d44809e2f222fb2334030603 (diff) | |
| parent | e596cdddf349b244dca854bf5a7aa9428b48fc50 (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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index a213e8e25b..bbaf9de0bc 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,7 @@ git-gc git-get-tar-commit-id git-grep git-hash-object +git-help git-http-fetch git-http-push git-imap-send |