git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-19 19:39:56 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

completion: --edit and --no-edit for git-merge

Browse Source 
Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Adrian Weimann
2012-01-30 20:29:33 +01:00
committed by Junio C Hamano
parent 85da4d459b
commit aad0709221
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-completion.bash
View File

@@ -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 ()