git/contrib, branch v2.7.2

Merge branch 'pw/completion-stash' into maint

2016-02-22T21:10:20Z

* pw/completion-stash: completion: fix mis-indentation in _git_stash()

completion: fix mis-indentation in _git_stash()

2016-02-22T18:26:04Z

Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

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"

Merge branch 'jk/completion-rebase' into maint

2016-02-05T22:54:16Z

* jk/completion-rebase: completion: add missing git-rebase options

Merge branch 'dw/subtree-split-do-not-drop-merge' into maint

2016-02-05T22:54:15Z

The "split" subcommand of "git subtree" (in contrib/) incorrectly skipped merges when it shouldn't, which was corrected. * dw/subtree-split-do-not-drop-merge: contrib/subtree: fix "subtree split" skipped-merge bug

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