git/contrib, branch v2.4.9

Merge branch 'sg/completion-commit-cleanup' into maint

2015-08-03T17:41:33Z

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

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

Merge branch 'pa/auto-gc-mac-osx' into maint

2015-07-15T18:41:17Z

Recent Mac OS X updates breaks the logic to detect that the machine is on the AC power in the sample pre-auto-gc script. * pa/auto-gc-mac-osx: hooks/pre-auto-gc: adjust power checking for newer OS X

hooks/pre-auto-gc: adjust power checking for newer OS X

2015-06-12T22:33:39Z

The output of "pmset -g batt" changed at some point from "Currently drawing from 'AC Power'" to the slightly different "Now drawing from 'AC Power'". Starting the match from "drawing" makes the check work in both old and new versions of OS X. Signed-off-by: Panagiotis Astithas Signed-off-by: Junio C Hamano

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

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