5 usage
: git jump
<mode
> [<args
>]
7 Jump to interesting elements
in an editor.
8 The
<mode
> parameter is one of
:
10 diff: elements are
diff hunks. Arguments are given to
diff.
12 merge
: elements are merge conflicts. Arguments are ignored.
14 grep: elements are
grep hits. Arguments are given to
grep.
16 ws
: elements are whitespace errors. Arguments are given to
diff --check.
21 editor
=`git var GIT_EDITOR`
26 git
diff --no-prefix --relative "$@" |
28 if (m{^\+\+\+ (.*)}) { $file = $1; next }
29 defined($file) or next;
30 if (m/^@@ .*?\+(\d+)/) { $line = $1; next }
31 defined($line) or next;
32 if (/^ /) { $line++; next }
34 print "$file:$line: $1\n";
42 perl
-pe 's/^.*?\t//' |
44 while IFS
= read fn
; do
45 grep -Hn '^<<<<<<<' "$fn"
49 # Grep -n generates nice quickfix-looking lines by itself,
50 # but let's clean up extra whitespace, so they look better if the
51 # editor shows them to us in the status bar.
64 if test $# -lt 1; then
70 trap 'rm -f "$tmp"' 0 1 2 3 15
71 tmp
=`mktemp -t git-jump.XXXXXX` ||
exit 1
72 type "mode_$mode" >/dev
/null
2>&1 ||
{ usage
>&2; exit 1; }
73 "mode_$mode" "$@" >"$tmp"
74 test -s "$tmp" ||
exit 0