git/contrib, branch v2.3.0

Merge branch 'tf/prompt-preserve-exit-status'

2015-01-14T20:35:49Z

Using the exit status of the last command in the prompt, e.g. PS1='$(__git_ps1) $? ', did not work well because the helper function stomped on the exit status. * tf/prompt-preserve-exit-status: git-prompt: preserve value of $? in all cases

Merge branch 'rh/hide-prompt-in-ignored-directory'

2015-01-14T20:34:01Z

* rh/hide-prompt-in-ignored-directory: git-prompt.sh: allow to hide prompt for ignored pwd git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

Merge branch 'mm/complete-rebase-autostash'

2015-01-14T20:33:57Z

* mm/complete-rebase-autostash: git-completion: add --autostash for 'git rebase'

Merge branch 'sp/subtree-doc'

2015-01-14T20:33:46Z

* sp/subtree-doc: subtree: fix AsciiDoc list item continuation

git-prompt: preserve value of $? in all cases

2015-01-14T18:11:49Z

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

Merge branch 'tf/prompt-preserve-exit-status'

2015-01-07T21:09:35Z

Merge branch 'pd/completion-filenames-fix'

2015-01-07T21:06:37Z

The top-of-the-file instruction for completion scripts (in contrib/) did not name the files correctly. * pd/completion-filenames-fix: Update documentation occurrences of filename .sh

git-completion: add --autostash for 'git rebase'

2015-01-07T18:42:53Z

This option was added in 58794775 (rebase: implement --[no-]autostash and rebase.autostash, 2013-05-12). Completion of "--autosquash" has been there, but this was not; addition of this would require people completing "--autosquash" to type a bit more than before. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

git-prompt.sh: allow to hide prompt for ignored pwd

2015-01-07T18:30:30Z

Optionally set __git_ps1 to display nothing when present working directory is ignored, triggered by the new environment variable GIT_PS1_HIDE_IF_PWD_IGNORED. This environment variable may be overridden on any repository by setting bash.hideIfPwdIgnored to "false". In the absence of GIT_PS1_HIDE_IF_PWD_IGNORED this change has no effect. Many people manage e.g. dotfiles in their home directory with git. This causes the prompt generated by __git_ps1 to refer to that "top level" repo while working in any descendant directory. That can be distracting, so this patch helps one shut off that noise. Signed-off-by: Jess Austin Signed-off-by: Richard Hansen Reviewed-by: Richard Hansen Signed-off-by: Junio C Hamano

git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

2015-01-07T18:27:53Z

At the beginning of __git_ps1, right after determining that the function is running in pc mode, set PS1 to a plain (undecorated) prompt. This makes it possible to simply return early without having to set PS1 if the prompt should not be decorated. Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano