projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6d2b06f) | patch
completion: add missing options for git-merge
authorJohn Keeping <john@keeping.me.uk>
Thu, 22 May 2014 13:58:38 +0000 (14:58 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2014 19:27:50 +0000 (12:27 -0700)
commit8fee8726470bd63db6c396ea6208ea487eaa8fab
tree725190b47e313793c1c7762c56b6eb8860f94ffctree | snapshot
parent6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6fcommit | diff
completion: add missing options for git-merge

The options added to __git_merge_options are those that git-pull passes
to git-merge, since that variable is used by both commands.

Those added directly in _git_merge() are specific to git-merge and
are not passed thru from git-pull.

Reported-by: Haralan Dobrev <hkdobrev@gmail.com>
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.