git/contrib/completion/git-completion.bash, branch v2.7.1

Merge branch 'tb/complete-word-diff-regex' into maint

2016-02-05T22:54:17Z

* tb/complete-word-diff-regex: completion: complete "diff --word-diff-regex="

Merge branch 'pw/completion-stash' into maint

2016-02-05T22:54:16Z

* pw/completion-stash: completion: update completion arguments for stash

Merge branch 'pw/completion-show-branch' into maint

2016-02-05T22:54:16Z

* pw/completion-show-branch: completion: complete show-branch "--date-order"

completion: update completion arguments for stash

2016-01-26T18:37:11Z

Add --all and --include-untracked to the git stash save completions. Add --quiet to the git stash drop completions. Update git stash branch so that the first argument expands out to the possible branch names, and the other arguments expand to the stash names. Signed-off-by: Paul Wagland Signed-off-by: Junio C Hamano

completion: complete show-branch "--date-order"

2016-01-25T23:15:26Z

Signed-off-by: Paul Wagland Signed-off-by: Junio C Hamano

completion: add missing git-rebase options

2016-01-25T23:13:54Z

This adds the --no-* variants where those are documented in git-rebase(1). Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

completion: complete "diff --word-diff-regex="

2016-01-21T00:18:02Z

Signed-off-by: Thomas Braun Signed-off-by: Junio C Hamano

Merge branch 'sg/completion-no-column'

2015-12-21T18:59:06Z

The completion script (in contrib/) used to list "git column" (which is not an end-user facing command) as one of the choices * sg/completion-no-column: completion: remove 'git column' from porcelain commands

completion: fix completing unstuck email alias arguments

2015-12-14T22:01:37Z

Completing unstuck form of email aliases doesn't quite work: $ git send-email --to alice bob cecil $ git send-email --to a alice bob cecil While listing email aliases works as expected, the second case should just complete to 'alice', but it keeps offering all email aliases instead. The cause for this behavior is that in this case we mistakenly tell __gitcomp() explicitly that the current word to be completed is empty, while in reality it is not. As a result __gitcomp() doesn't filter out non-matching aliases, so all aliases end up being offered over and over again. Fix this by not passing the current word to be completed to __gitcomp() and letting it go the default route and grab it from the '$cur' variable. Don't pass empty prefix either, because it's assumed to be empty when unspecified, so it's not necessary. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

completion: remove 'git column' from porcelain commands

2015-12-11T20:43:16Z

'git column' is an internal helper, so it should not be offered on 'git ' along with porcelain commands. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano