aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-17 15:59:34 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-17 15:59:34 -0700
commitb61f55be0060ab47b154d979f919dd969f29d314 (patch)
tree3566700e4b8f8d992d9e599b7a933473a3139ea9 /contrib
parent26f4f2c74e2632b708ba3dd4ae2e69d359878ccd (diff)
parent5805853f228acafe1d45edeef780cd1b00b952aa (diff)
downloadgit-b61f55be0060ab47b154d979f919dd969f29d314.tar.gz
git-b61f55be0060ab47b154d979f919dd969f29d314.tar.xz
Merge branch 'maint'
* maint: t/perf: add "trash directory" to .gitignore Add missing -z to git check-attr usage text for consistency with man page git-jump: ignore (custom) prefix in diff mode Documentation: indent-with-non-tab uses "equivalent tabs" not 8 completion: add --no-edit to git-commit
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash3
-rwxr-xr-xcontrib/git-jump/git-jump4
2 files changed, 4 insertions, 3 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1b43329ed..be800e09b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1018,7 +1018,8 @@ _git_commit ()
--*)
__gitcomp "
--all --author= --signoff --verify --no-verify
- --edit --amend --include --only --interactive
+ --edit --no-edit
+ --amend --include --only --interactive
--dry-run --reuse-message= --reedit-message=
--reset-author --file= --message= --template=
--cleanup= --untracked-files --untracked-files=
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index a33674e47..dc90cd637 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -21,9 +21,9 @@ open_editor() {
}
mode_diff() {
- git diff --relative "$@" |
+ git diff --no-prefix --relative "$@" |
perl -ne '
- if (m{^\+\+\+ b/(.*)}) { $file = $1; next }
+ if (m{^\+\+\+ (.*)}) { $file = $1; next }
defined($file) or next;
if (m/^@@ .*\+(\d+)/) { $line = $1; next }
defined($line) or next;