git/contrib, branch v2.3.3

Merge branch 'av/wincred-with-at-in-username-fix' into maint

2015-03-05T21:13:04Z

The credential helper for Windows (in contrib/) used to mishandle a user name with an at-sign in it. * av/wincred-with-at-in-username-fix: wincred: fix get credential if username has "@"

wincred: fix get credential if username has "@"

2015-01-26T04:08:56Z

Such a username with "@" in it isn't all that unusual these days. cf. https://groups.google.com/forum/#!msg/msysgit/YVuCqmwwRyY/HULHj5OoE88J Signed-off-by: Aleksey Vasenev Acked-by: Erik Faye-Lund Signed-off-by: Junio C Hamano

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