aboutsummaryrefslogtreecommitdiffstats
path: root/diffcore-break.c
diff options
context:
space:
mode:
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-18 01:18:01 +0000
h=v1.8.4'>v1.8.4Junio C Hamano2-1/+6 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-08-21Typofix draft release notes to 1.8.4Junio C Hamano1-2/+2 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-08-19Git 1.8.4-rc4v1.8.4-rc4Junio C Hamano2-10/+1 As we had to revert two topics at the last minute, let's have another (hopefully short) round of rc to make sure the final release will be sound. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-08-14Revert "Add new @ shortcut for HEAD"Junio C Hamano5-28/+0 This reverts commit cdfd94837b27c220f70f032b596ea993d195488f, as it does not just apply to "@" (and forms with modifiers like @{u} applied to it), but also affects e.g. "refs/heads/@/foo", which it shouldn't. The basic idea of giving a short-hand might be good, and the topic can be retried later, but let's revert to avoid affecting existing use cases for now for the upcoming release. 2013-08-14Revert "git stash: avoid data loss when "git stash save" kills a directory"Junio C Hamano3-40/+2 This reverts commit a73653130edd6a8977106d45a8092c09040f9132, as it has been reported that "ls-files --killed" is too time-consuming in a deep directory with too many untracked crufts (e.g. $HOME/.git tracking only a few files). We'd need to revisit it later but "ls-files --killed" needs to be optimized before it happens. 2013-08-13Git 1.8.4-rc3v1.8.4-rc3Junio C Hamano1-1/+1 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-08-13.mailmap: Combine more (name, email) to individual personsStefan Beller1-1/+3 Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-08-13.mailmap: update long-lost friends with multiple defunct addressesJunio C Hamano1-1/+13 A handful of past contributors are recorded with multiple e-mail addresses, all of which are undeliverable. With a lot of help from Jonathan, we located all of them except for one person, and a pair of addresses we suspect belong to a single person but we are not certain. Update the found ones with their currently preferred address, and use the last known address to consolidate contributions by the lost one. Helped-by: Stefan Beller <stefanbeller@googlemail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-08-13git-remote-mediawiki: ignore generated git-mwMatthieu Moy1-0/+1 Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-08-11l10n: Add reference for french translation teamJean-Noel Avila1-0/+4 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>