| commit | 8fee8726470bd63db6c396ea6208ea487eaa8fab | |
| author | John Keeping <john@keeping.me.uk> | |
| Thu, 22 May 2014 13:58:38 +0000 (22 14:58 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 May 2014 19:27:50 +0000 (27 12:27 -0700) | ||
| tree | 725190b47e313793c1c7762c56b6eb8860f94ffc | treesnapshot (tar.gz zip) |
| parent | 6d2b06f02b9c69351a55a2cad0cfab33ecb6ee6f | commitdiff |
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>
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 | diffblobblamehistory |