* [PATCH] completion: --edit option for git-merge @ 2012-01-30 13:37 Adrian Weimann 2012-01-30 18:15 ` Junio C Hamano 0 siblings, 1 reply; 3+ messages in thread From: Adrian Weimann @ 2012-01-30 13:37 UTC (permalink / raw) To: git, gitster; +Cc: Adrian Weimann Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com> --- 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..be1fcea 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 " _git_merge () -- 1.7.9 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] completion: --edit option for git-merge 2012-01-30 13:37 [PATCH] completion: --edit option for git-merge Adrian Weimann @ 2012-01-30 18:15 ` Junio C Hamano 2012-01-30 19:29 ` [PATCH] completion: --edit and --no-edit " Adrian Weimann 0 siblings, 1 reply; 3+ messages in thread From: Junio C Hamano @ 2012-01-30 18:15 UTC (permalink / raw) To: Adrian Weimann; +Cc: git Thanks. Once we start suggesting --edit, don't we also need to suggest --no-edit, which I think is more important for two reasons. ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] completion: --edit and --no-edit for git-merge 2012-01-30 18:15 ` Junio C Hamano @ 2012-01-30 19:29 ` Adrian Weimann 0 siblings, 0 replies; 3+ messages in thread From: Adrian Weimann @ 2012-01-30 19:29 UTC (permalink / raw) To: git, gitster; +Cc: Adrian Weimann Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com> --- 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 () -- 1.7.9 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-30 19:30 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-30 13:37 [PATCH] completion: --edit option for git-merge Adrian Weimann 2012-01-30 18:15 ` Junio C Hamano 2012-01-30 19:29 ` [PATCH] completion: --edit and --no-edit " Adrian Weimann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).