summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2009-01-19 22:17:59 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-19 15:16:24 -0800
commit47d5a8fa7188cceb90fe50f1561e64381e8530a3 (patch)
treeadbc141cffd8c8ed52cea07f310c36376268b2a1
parentdifftool: put the cursor on the editable file for Vim (diff)
downloadtgif-47d5a8fa7188cceb90fe50f1561e64381e8530a3.tar.xz
bash completion: move pickaxe options to log
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@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/completion/git-completion.bash3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 60497a4c2a..b5d3bbbceb 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
;;