Move the options --pickaxe-all and --pickaxe-regex to git-log, where they make more sense than with git-diff. Signed-off-by: Thomas Rast <trast@xxxxxxxxxxxxxxx> --- Shawn O. Pearce wrote: > Junio C Hamano <gitster@xxxxxxxxx> wrote: > > The changes around pickaxe made me "Huh?". For log pickaxe makes very > > good sense but for a single diff it doesn't, yet the original seems to > > have had them only on "git diff" and not on "git log", which feels wrong. > > I agree completely. The pickaxe stuff in current completion is > just plain wrong. I'd like to see it fixed with this cleanup. > Maybe do it in two parts; fix the pickaxe options to be on log > and not diff, and then do the cleanup for the common options. Good point. Sorry for not noticing in the first place; I was too focused on just getting git-show completion working ;-) contrib/completion/git-completion.bash | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 60497a4..b5d3bbb 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -784,7 +784,7 @@ _git_diff () --patch-with-stat --name-only --name-status --color --no-color --color-words --no-renames --check --full-index --binary --abbrev --diff-filter= - --find-copies-harder --pickaxe-all --pickaxe-regex + --find-copies-harder --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --exit-code --quiet --ext-diff --no-ext-diff @@ -986,6 +986,7 @@ _git_log () --parents --children --full-history --merge --inter-hunk-context= + --pickaxe-all --pickaxe-regex " return ;; -- tg: (28da86a..) t/bash-complete-pickaxe (depends on: origin/master) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
