git/contrib, branch v2.3.4Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.3.42015-03-23T18:23:33ZMerge branch 'sg/completion-remote' into maint2015-03-23T18:23:33ZJunio C Hamanogitster@pobox.com2015-03-23T18:23:33Zurn:sha1:7d6f6e373007553d747b4f0f5083d66fdd0c17c5
Code simplification.
* sg/completion-remote:
completion: simplify __git_remotes()
completion: add a test for __git_remotes() helper function
Merge branch 'mg/doc-status-color-slot' into maint2015-03-23T18:23:31ZJunio C Hamanogitster@pobox.com2015-03-23T18:23:30Zurn:sha1:ffac6258de4f72e06b6b2e412deffb00a1abb339
Documentation fixes.
* mg/doc-status-color-slot:
config,completion: add color.status.unmerged
config,completion: add color.status.unmerged2015-03-10T22:27:59ZMichael J Grubergit@drmicha.warpmail.net2015-03-10T16:11:09Zurn:sha1:0d6accc01d4073d685ece5ba9fd0a439539a5a02
Reported-by: "Mladen B." <mladen074@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
completion: simplify __git_remotes()2015-03-06T20:48:02ZSZEDER Gáborszeder@ira.uka.de2015-03-04T14:10:29Zurn:sha1:53e53c7c81ce2c7c4cd45f95bc095b274cb28b76
The __git_remotes() helper function lists the remotes from the config
file by processing the output of a 'git config' query. A simple 'git
remote' produces the exact same output, so run that instead.
Remotes under '$GIT_DIR/remotes' are still listed by running 'ls -1',
because 'git remote' unfortunately ignores them.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'av/wincred-with-at-in-username-fix' into maint2015-03-05T21:13:04ZJunio C Hamanogitster@pobox.com2015-03-05T21:13:04Zurn:sha1:518d1c349bda5652a6884127f1d7f5722d557bc8
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:56ZAleksey Vasenevmargtu-fivt@ya.ru2014-11-19T21:47:32Zurn:sha1:13d261e53abdfe0ee61eb04b483a01509c0b43d2
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 <margtu-fivt@ya.ru>
Acked-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tf/prompt-preserve-exit-status'2015-01-14T20:35:49ZJunio C Hamanogitster@pobox.com2015-01-14T20:35:48Zurn:sha1:9920c718254d946e685ef1295ff9ea0c14bac9cf
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:01ZJunio C Hamanogitster@pobox.com2015-01-14T20:34:01Zurn:sha1:e1ef7d177c3fcfdd25df9c4b67d36012bedebd74
* 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:57ZJunio C Hamanogitster@pobox.com2015-01-14T20:33:57Zurn:sha1:1e7ef5d9bf49a7de85e9a4d25f1a44ed955c40fc
* mm/complete-rebase-autostash:
git-completion: add --autostash for 'git rebase'
Merge branch 'sp/subtree-doc'2015-01-14T20:33:46ZJunio C Hamanogitster@pobox.com2015-01-14T20:33:45Zurn:sha1:41753312e1020880d9d1d488e58f8d7860d84579
* sp/subtree-doc:
subtree: fix AsciiDoc list item continuation