diff options
| author | Adrian Weimann <adrian.weimann@googlemail.com> | 2012-01-30 19:29:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-06 08:00:54 (GMT) |
| commit | 2ff14e31bd8c91356d54b7bac064e7cc615e56b3 (patch) | |
| tree | 30f70c3c763ca031e1856cdf2c9c0ab336336292 /contrib | |
| parent | f2120eb4db3e3e3f9a336eb04fdc2319d7421536 (diff) | |
| download | git-2ff14e31bd8c91356d54b7bac064e7cc615e56b3.zip git-2ff14e31bd8c91356d54b7bac064e7cc615e56b3.tar.gz git-2ff14e31bd8c91356d54b7bac064e7cc615e56b3.tar.bz2 | |
completion: --edit and --no-edit for git-merge
Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 1496c6d..78be195 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1622,7 +1622,7 @@ _git_log () __git_merge_options=" --no-commit --no-stat --log --no-log --squash --strategy - --commit --stat --no-squash --ff --no-ff --ff-only + --commit --stat --no-squash --ff --no-ff --ff-only --edit --no-edit " _git_merge () |