diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:10:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 00:10:14 -0800 |
| commit | 7bb5321be0ecb70a990ad49da2a1366c19201372 (patch) | |
| tree | 82a8429e88beddb3b8bf8fb84aa39800670ae31d /contrib/completion | |
| parent | Merge branch 'js/maint-merge-recursive-r-d-conflict' (diff) | |
| parent | diff: add option to show context between close hunks (diff) | |
| download | tgif-7bb5321be0ecb70a990ad49da2a1366c19201372.tar.xz | |
Merge branch 'rs/diff-ihc'
* rs/diff-ihc:
diff: add option to show context between close hunks
Conflicts:
Documentation/diff-options.txt
Diffstat (limited to 'contrib/completion')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 3b25d48098..8ec782dc54 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -776,6 +776,7 @@ _git_diff () --no-ext-diff --no-prefix --src-prefix= --dst-prefix= --base --ours --theirs + --inter-hunk-context= " return ;; @@ -967,6 +968,7 @@ _git_log () --color-words --walk-reflogs --parents --children --full-history --merge + --inter-hunk-context= " return ;; |