diff options
| author |  John Keeping <john@keeping.me.uk> | 2014-05-22 14:58:38 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-05-27 12:27:50 -0700 |
| commit | 8fee8726470bd63db6c396ea6208ea487eaa8fab (patch) | |
| tree | 725190b47e313793c1c7762c56b6eb8860f94ffc /t/t7609-merge-co-error-msgs.sh | |
| parent | completion: add a note that merge options are shared (diff) | |
| download | tgif-8fee8726470bd63db6c396ea6208ea487eaa8fab.tar.xz | |
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>
Diffstat (limited to 't/t7609-merge-co-error-msgs.sh')
0 files changed, 0 insertions, 0 deletions