git, branch v1.8.4-rc4

Git 1.8.4-rc4

2013-08-19T17:34:14Z

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

Revert "Add new @ shortcut for HEAD"

2013-08-14T22:04:24Z

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.

Revert "git stash: avoid data loss when "git stash save" kills a directory"

2013-08-14T16:53:43Z

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.

Git 1.8.4-rc3

2013-08-13T18:10:18Z

Signed-off-by: Junio C Hamano

Merge git://github.com/git-l10n/git-po

2013-08-13T17:50:01Z

* git://github.com/git-l10n/git-po: l10n: Add reference for french translation team l10n: fr.po: 821/2112 messages translated

Merge branch 'sb/mailmap-updates'

2013-08-13T17:49:33Z

* sb/mailmap-updates: .mailmap: Combine more (name, email) to individual persons .mailmap: update long-lost friends with multiple defunct addresses

.mailmap: Combine more (name, email) to individual persons

2013-08-13T17:49:06Z

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

.mailmap: update long-lost friends with multiple defunct addresses

2013-08-13T17:47:44Z

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 Helped-by: Jonathan Nieder Signed-off-by: Junio C Hamano

git-remote-mediawiki: ignore generated git-mw

2013-08-13T16:52:22Z

Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

l10n: Add reference for french translation team

2013-08-11T15:14:58Z

Signed-off-by: Jean-Noel Avila