git/contrib, branch v2.5.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.5.22015-08-19T21:41:25ZMerge branch 'da/subtree-date-confusion' into maint2015-08-19T21:41:25ZJunio C Hamanogitster@pobox.com2015-08-19T21:41:24Zurn:sha1:5a30374a29a4ee9725d6ea165ead19a748eaed4c
"git subtree" (in contrib/) depended on "git log" output to be
stable, which was a no-no. Apply a workaround to force a
particular date format.
* da/subtree-date-confusion:
contrib/subtree: ignore log.date configuration
contrib/subtree: ignore log.date configuration2015-07-23T22:08:41ZDavid Aguilardavvid@gmail.com2015-07-22T00:01:02Zurn:sha1:e7aac44ed276bc0de0253baa8e3f5ac247044a31
git-subtree's log format string uses "%ad" and "%cd", which
respect the user's configured log.date value.
This is problematic for git-subtree because it needs to use real
dates so that copied commits come through unchanged.
Add a test and tweak the format strings to use %aD and %cD
so that the default date format is used instead.
Reported-by: Bryan Jacobs <b@q3q.us>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/prompt-document-ps1-state-separator' into maint2015-07-15T18:41:26ZJunio C Hamanogitster@pobox.com2015-07-15T18:41:26Zurn:sha1:51d5980ea019a28b38d2f9612314daf3ea536e82
Docfix.
* jc/prompt-document-ps1-state-separator:
git-prompt.sh: document GIT_PS1_STATESEPARATOR
Merge branch 'af/tcsh-completion-noclobber' into maint2015-07-15T18:41:18ZJunio C Hamanogitster@pobox.com2015-07-15T18:41:18Zurn:sha1:ada9ecd98947aa0d80945f3a7a24486efcda370b
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 maint2015-07-15T18:41:17ZJunio C Hamanogitster@pobox.com2015-07-15T18:41:17Zurn:sha1:7c621186bae3204af11ed60984ff3d1df0eddb44
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
Merge branch 'cb/subtree-tests-update'2015-07-10T21:17:56ZJunio C Hamanogitster@pobox.com2015-07-10T21:17:56Zurn:sha1:3cbb92054b2b9cafbf2a662f7858e5896d3e7ac4
Tests update in contrib/subtree.
* cb/subtree-tests-update:
contrib/subtree: small tidy-up to test
contrib/subtree: fix broken &&-chains and revealed test error
contrib/subtree: use tabs consitently for indentation in tests
git-multimail: update to release 1.1.12015-07-06T16:43:17ZMatthieu MoyMatthieu.Moy@imag.fr2015-07-05T11:10:17Zurn:sha1:5bdb7a78adf2a2656a1915e6fa656aecb45c1fc3
The only change is a bugfix: the SMTP mailer was not working with
Python 2.4.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'jc/prompt-document-ps1-state-separator'2015-07-01T21:02:32ZJunio C Hamanogitster@pobox.com2015-07-01T21:02:32Zurn:sha1:d70bc3b97a4792ba99117ac6b0051ff367d78419
Docfix.
* jc/prompt-document-ps1-state-separator:
git-prompt.sh: document GIT_PS1_STATESEPARATOR
Merge branch 'pa/auto-gc-mac-osx'2015-06-24T19:21:58ZJunio C Hamanogitster@pobox.com2015-06-24T19:21:58Zurn:sha1:3072ec397c06af6abb693287928e39f3b8f3ae4d
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
Merge branch 'af/tcsh-completion-noclobber'2015-06-24T19:21:53ZJunio C Hamanogitster@pobox.com2015-06-24T19:21:53Zurn:sha1:c595cb9c4f7c5fb2b09c5f3d3c07cf4488dc7ef9
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