Merge branch 'tb/complete-diff-anchored'

gitster · gitster · commit 3a7d26bb4b60 · 2021-07-08T13:14:56.000-07:00
The command line completion (in contrib/) learned that "git diff"
takes the "--anchored" option.

* tb/complete-diff-anchored:
  completion: add --anchored to diff's options
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1729,6 +1729,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--indent-heuristic --no-indent-heuristic
 			--textconv --no-textconv
 			--patch --no-patch
+			--anchored=
 "
 
 __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex

Original file line number	Diff line number	Diff line change
`@@ -1729,6 +1729,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary`
`1729`	`1729`	`--indent-heuristic --no-indent-heuristic`
`1730`	`1730`	`--textconv --no-textconv`
`1731`	`1731`	`--patch --no-patch`
	`1732`	`+ --anchored=`
`1732`	`1733`	`"`
`1733`	`1734`
`1734`	`1735`	`__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex`