git/contrib, branch v2.9.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.9.22016-07-06T20:06:40ZMerge branch 'nb/gnome-keyring-build' into maint2016-07-06T20:06:40ZJunio C Hamanogitster@pobox.com2016-07-06T20:06:40Zurn:sha1:1729853432011faa51a88ab9831dc9b382a6ee7e
Build improvements for gnome-keyring (in contrib/)
* nb/gnome-keyring-build:
gnome-keyring: Don't hard-code pkg-config executable
Merge branch 'vs/prompt-avoid-unset-variable' into maint2016-07-06T20:06:38ZJunio C Hamanogitster@pobox.com2016-07-06T20:06:38Zurn:sha1:8162401fb0ab16addc6e003a93b8d195cce3fad4
The git-prompt scriptlet (in contrib/) was not friendly with those
who uses "set -u", which has been fixed.
* vs/prompt-avoid-unset-variable:
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha
gnome-keyring: Don't hard-code pkg-config executable2016-06-14T20:06:10ZHeiko Beckerheirecka@exherbo.org2016-06-14T11:27:05Zurn:sha1:3cddb008c15978ae81ff144e24303467076d200f
Helpful if your pkg-config executable has a prefix based on the
architecture, for example.
Signed-off-by: Heiko Becker <heirecka@exherbo.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_sha2016-06-06T20:09:07ZVille Skyttäville.skytta@iki.fi2016-06-06T16:29:33Zurn:sha1:34d8f5a8aa4aa17af3158f325173eb08c9c05eb1
When the shell is in "nounset" or "set -u" mode, referencing unset or
null variables results in an error. Protect $ZSH_VERSION and
$BASH_VERSION against that, and initialize $short_sha before use.
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-multimail: update to release 1.3.12016-05-13T19:54:06ZMatthieu MoyMatthieu.Moy@imag.fr2016-05-13T17:00:41Zurn:sha1:17130a704620c0e5455ef0f362f8d0f40758d1ea
The changes are described in CHANGES.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with maint2016-05-03T21:52:30ZJunio C Hamanogitster@pobox.com2016-05-03T21:52:30Zurn:sha1:4bb51aed1e858bfac174255ae4d8994af3a8e07a
* maint:
git-multimail: update to release 1.3.0
git-multimail: update to release 1.3.02016-05-03T21:04:27ZMatthieu MoyMatthieu.Moy@imag.fr2016-05-03T08:31:42Zurn:sha1:4453d76c6abf28a3945a336c5321ea05f07bd8b6
The changes are described in CHANGES.
Contributions-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Contributions-by: Stefan Tatschner <rumpelsepp@sevenbyte.org>
Contributions-by: Simon P <simon.git@le-huit.fr>
Contributions-by: Leander Hasty <leander@1stplayable.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'mg/complete-cherry-mark-to-log'2016-04-13T21:12:40ZJunio C Hamanogitster@pobox.com2016-04-13T21:12:39Zurn:sha1:f0442976149da225fd9e7796436b2122a6bb7f0f
The completion scripts (in contrib/) did not include the
"--cherry-mark" option when completing "git log <HT>".
* mg/complete-cherry-mark-to-log:
completion: complete --cherry-mark for git log
Merge branch 'rt/completion-help'2016-04-13T21:12:29ZJunio C Hamanogitster@pobox.com2016-04-13T21:12:29Zurn:sha1:8b7475aefc0a88da65c6d495fc518b2b8a72ff47
Shell completion (in contrib/) updates.
* rt/completion-help:
completion: add 'revisions' and 'everyday' to 'git help'
completion: add option '--guides' to 'git help'
completion: complete --cherry-mark for git log2016-04-05T20:53:54ZMichael J Grubergit@drmicha.warpmail.net2016-04-05T10:45:35Zurn:sha1:d3bfbf91dfb4257b064cce6e5860e8e7317e6da8
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>