git/contrib/completion, branch v2.5.2

Merge branch 'jc/prompt-document-ps1-state-separator'

2015-07-01T21:02:32Z

Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR

Merge branch 'af/tcsh-completion-noclobber'

2015-06-24T19:21:53Z

The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * af/tcsh-completion-noclobber: git-completion.tcsh: fix redirect with noclobber

Merge branch 'sg/completion-commit-cleanup'

2015-06-24T19:21:51Z

* sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup='

Merge branch 'tb/complete-sequencing'

2015-06-11T16:29:59Z

The bash completion script (in contrib/) learned a few options that "git revert" takes. * tb/complete-sequencing: completion: suggest sequencer commands for revert

git-prompt.sh: document GIT_PS1_STATESEPARATOR

2015-06-10T21:53:14Z

The environment variable GIT_PS1_STATESEPARATOR can be used to set the separator between the branch name and the state symbols in the prompt. At present the variable is not mentioned in the inline documentation which makes it difficult for the casual user to identify. Signed-off-by: Joe Cridge Signed-off-by: Junio C Hamano

git-completion.tcsh: fix redirect with noclobber

2015-06-09T18:21:15Z

tcsh users who happen to have 'set noclobber' elsewhere in their ~/.tcshrc or ~/.cshrc startup files get a 'File exist' error, and the tcsh completion file doesn't get generated/updated. Adding a `!` in the redirect works correctly for both clobber (default) and 'set noclobber' users. Reviewed-by: Christian Couder Signed-off-by: Ariel Faigon Signed-off-by: Junio C Hamano

completion: teach 'scissors' mode to 'git commit --cleanup='

2015-06-08T15:46:47Z

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

completion: suggest sequencer commands for revert

2015-06-01T15:41:47Z

Signed-off-by: Thomas Braun Acked-by: Ramkumar Ramachandra Signed-off-by: Junio C Hamano

Merge branch 'sg/completion-config'

2015-05-22T19:41:54Z

Code clean-up for completion script (in contrib/). * sg/completion-config: completion: simplify query for config variables completion: add a helper function to get config variables

Merge branch 'ls/http-ssl-cipher-list'

2015-05-22T19:41:45Z

Introduce http..SSLCipherList configuration variable to tweak the list of cipher suite to be used with libcURL when talking with https:// sites. * ls/http-ssl-cipher-list: http: add support for specifying an SSL cipher list