git/contrib/completion, branch v2.4.7

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

2015-07-15T18:41:26Z

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

Merge branch 'af/tcsh-completion-noclobber' into maint

2015-07-15T18:41:18Z

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

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

Merge branch 'sg/complete-decorate-full-not-long' into maint

2015-05-26T20:49:22Z

The completion for "log --decorate=" parameter value was incorrect. * sg/complete-decorate-full-not-long: completion: fix and update 'git log --decorate=' options

completion: fix and update 'git log --decorate=' options

2015-05-03T18:46:14Z

'git log --decorate=' understands the 'full', 'short' and 'no' options. From these the completion script only offered 'short' and it offered 'long' instead of 'full'. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

Merge branch 'ma/bash-completion-leaking-x'

2015-04-20T22:28:30Z

The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend

completion: fix global bash variable leak on __gitcompappend

2015-04-13T05:35:51Z

Signed-off-by: Junio C Hamano

Merge branch 'sg/completion-gitcomp-nl-for-refs'

2015-03-26T18:57:13Z

Code clean-up. * sg/completion-gitcomp-nl-for-refs: completion: use __gitcomp_nl() for completing refs

Merge branch 'ct/prompt-untracked-fix'

2015-03-25T19:54:18Z

The prompt script (in contrib/) did not show the untracked sign when working in a subdirectory without any untracked files. * ct/prompt-untracked-fix: git prompt: use toplevel to find untracked files