Re: [PATCH 2/2] completion: add missing options for git-merge

2014-05-22 Thread Junio C Hamano
John Keeping writes: > The options added to __git_merge_options are those that git-pull also > understands, since that variable is used by both commands. Those added > directly in _git_merge() are specific to git-merge and are not > supported by git-pull. Interesting. Technically, "are not pas

[PATCH 2/2] completion: add missing options for git-merge

2014-05-22 Thread John Keeping
The options added to __git_merge_options are those that git-pull also understands, since that variable is used by both commands. Those added directly in _git_merge() are specific to git-merge and are not supported by git-pull. Reported-by: Haralan Dobrev Signed-off-by: John Keeping --- contrib