diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 18:38:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 18:38:38 (GMT) |
| commit | b6de2dcb80849c5deed613cfdaf194f933d8c0d6 (patch) | |
| tree | 5bcd95c9423642f52f18fecd902cc7095a399492 /contrib/completion/git-completion.bash | |
| parent | 14e2ae6126509feeb379f490d925cccd3dd9f7c0 (diff) | |
| parent | c254516737c2c1e6ef8ce49d798cebb06fd6d3ee (diff) | |
| download | git-b6de2dcb80849c5deed613cfdaf194f933d8c0d6.zip git-b6de2dcb80849c5deed613cfdaf194f933d8c0d6.tar.gz git-b6de2dcb80849c5deed613cfdaf194f933d8c0d6.tar.bz2 | |
Merge branch 'tb/complete-diff-ignore-blank-lines'
* tb/complete-diff-ignore-blank-lines:
completion: Add --ignore-blank-lines for diff
Diffstat (limited to 'contrib/completion/git-completion.bash')
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 06bf262..5ea5b82 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1175,8 +1175,8 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --full-index --binary --abbrev --diff-filter= --find-copies-harder --text --ignore-space-at-eol --ignore-space-change - --ignore-all-space --exit-code --quiet --ext-diff - --no-ext-diff + --ignore-all-space --ignore-blank-lines --exit-code + --quiet --ext-diff --no-ext-diff --no-prefix --src-prefix= --dst-prefix= --inter-hunk-context= --patience --histogram --minimal |