git, branch v2.5.0-rc3

Git 2.5.0-rc3

2015-07-21T21:11:54Z

Signed-off-by: Junio C Hamano

Merge branch 'tf/gitweb-typofix'

2015-07-21T19:45:27Z

* tf/gitweb-typofix: gitweb: fix typo in man page

Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po

2015-07-21T17:27:33Z

l10n-2.5.0-rnd2 * tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po: l10n: ca.po: update translation l10n: de.po: translate 9 new messages l10n: Updated Bulgarian translation of git (2359t,0f,0u) l10n: zh_CN: for git v2.5.0 l10n round 2 l10n: sv.po: Update Swedish translation (2359t0f0u) l10n: fr v2.5.0 round 2 (2359t) l10n: ru.po: update Russian translation l10n: Updated Vietnamese translation (2359t) l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)

l10n: ca.po: update translation

2015-07-20T17:54:40Z

Signed-off-by: Alex Henrie

Merge branch 'jk/still-interesting'

2015-07-17T17:44:56Z

Code clean-up. * jk/still-interesting: revision.c: remove unneeded check for NULL

Merge branch 'es/worktree-add'

2015-07-17T17:44:55Z

Update to the "linked checkout" in 2.5.0-rc1. Instead of "checkout --to" that does not do what "checkout" normally does, move the functionality to "git worktree add". As this makes the end-user experience of the "worktree add" more or less complete, I am tempted to say we should cook the other topic that removes the internal "new-worktree-mode" hack from "checkout" a bit longer in 'next', and release 2.5 final without that one. * es/worktree-add: Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference worktree: caution that this is still experimental Documentation/git-worktree: fix stale "git checkout --to" references

Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference

2015-07-17T17:05:36Z

This should have been changed by 93a3649 (Documentation: move linked worktree description from checkout to worktree, 2015-07-06). Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

worktree: caution that this is still experimental

2015-07-16T22:59:48Z

Signed-off-by: Junio C Hamano

Documentation/git-worktree: fix stale "git checkout --to" references

2015-07-16T22:59:17Z

These should have been changed to "git worktree add" by fc56361 (worktree: introduce "add" command, 2015-07-06. Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano

Merge branch 'master' of https://github.com/ralfth/git-po-de

2015-07-15T23:44:43Z

* 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: translate 9 new messages