Merge tag 'v2.6.0'
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:18:58 +0000 (13:18 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 18:23:17 +0000 (13:23 -0500)
commit8cd02443c19869bf38a757a07536a68e62ab7d64
tree03ded721adb41774cf32e9fec974c75636637cab
parent983c9240df7a0dce1d6ffea6e92920f83295e21d
parentbe08dee9738eaaa0423885ed189c2b6ad8368cf0
Merge tag 'v2.6.0'

Git 2.6

* tag 'v2.6.0': (479 commits)
  Git 2.6
  Git 2.6-rc3
  send-email: fix uninitialized var warning for $smtp_auth
  l10n: de.po: better language for one string
  l10n: de.po: translate 2 messages
  l10n: Update and review Vietnamese translation (2440t)
  l10n: fr.po v2.6.0 round 2 (2440t)
  l10n: zh_CN: for git v2.6.0 l10n round 2
  l10n: ca.po: update translation
  l10n: git.pot: v2.6.0 round 2 (3 improvements)
  l10n: de.po: translate 123 new messages
  l10n: fr.po v2.6.0 round 1 (2441t)
  Update RelNotes to 2.6
  Git 2.5.3
  mailmap: update my entry with new email address
  Update RelNotes to 2.6 to describe leftover bits since -rc2
  Git 2.6-rc2
  poll: honor the timeout on Win32
  doc: show usage of branch description
  gitk: Accelerators for the main menu
  ...
43 files changed:
.gitignore
Documentation/config.txt
Documentation/git-branch.txt
Documentation/git-checkout.txt
Documentation/git-push.txt
Documentation/git-rebase.txt
GIT-VERSION-GEN
Makefile
branch.c
branch.h
builtin.h
builtin/add.c
builtin/apply.c
builtin/branch.c
builtin/commit.c
builtin/fetch.c
builtin/merge.c
builtin/push.c
builtin/reset.c
cache.h
commit.c
commit.h
config.c
environment.c
git-compat-util.h
git-rebase--interactive.sh
git-stash.sh
git-submodule.sh
git.c
parse-options.c
parse-options.h
sequencer.c
sha1_name.c
shared/git-completion.bash
shared/git-prompt.sh
shortlog.c
t/t1300-repo-config.sh
t/t3200-branch.sh
t/t9903-bash-prompt.sh
t/test-lib.sh
transport.c
transport.h
usage.c