Merge tag 'v2.8.0'
authorFelipe Contreras <felipe.contreras@gmail.com>
Thu, 19 May 2016 00:34:05 +0000 (19:34 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Thu, 19 May 2016 22:53:27 +0000 (17:53 -0500)
commitea0b62e13071bed9b835f889f3ca346f338a931c
tree04c35762a05ccc83c85199bbde2fe28a170e22be
parent038ab289526ac62da3384708f5f1aecfc568bb90
parent90f7b16b3adc78d4bbabbd426fb69aa78c714f71
Merge tag 'v2.8.0'

Git 2.8

* tag 'v2.8.0': (532 commits)
  Git 2.8
  Documentation: fix git-p4 AsciiDoc formatting
  mingw: skip some tests in t9115 due to file name issues
  t1300: fix the new --show-origin tests on Windows
  t1300-repo-config: make it resilient to being run via 'sh -x'
  config --show-origin: report paths with forward slashes
  submodule: fix regression for deinit without submodules
  l10n: pt_PT: Update and add new translations
  l10n: ca.po: update translation
  Git 2.8-rc4
  Documentation: fix broken linkgit to git-config
  Documentation: use ASCII quotation marks in git-p4
  Revert "config.mak.uname: use clang for Mac OS X 10.6"
  git-compat-util: st_add4: work around gcc 4.2.x compiler crash
  l10n: vi.po (2530t): Update translation
  l10n: zh_CN: review for git v2.8.0 l10n round 2
  gitk: Follow themed bgcolor in help dialogs
  gitk: fr.po: Sync translations with git
  gitk: Update French translation (311t)
  gitk: Update German translation
  ...
50 files changed:
.gitignore
Documentation/config.txt
Documentation/git-cherry-pick.txt
Documentation/git-commit.txt
Documentation/git-grep.txt
Documentation/git-pull.txt
Documentation/git-push.txt
Documentation/git-rebase.txt
Documentation/git-revert.txt
Documentation/githooks.txt
Documentation/revisions.txt
GIT-VERSION-GEN
Makefile
README.upstream
branch.c
branch.h
builtin/apply.c
builtin/branch.c
builtin/commit.c
builtin/fetch.c
builtin/grep.c
builtin/merge.c
builtin/push.c
builtin/rm.c
builtin/shortlog.c
cache.h
commit.c
config.c
credential.c
environment.c
git-compat-util.h
git-rebase--interactive.sh
git-rebase.sh
git-submodule.sh
git.c
remote.c
remote.h
sequencer.c
sha1_name.c
shared/git-completion.bash
shortlog.c
t/Makefile
t/t1300-repo-config.sh
t/t1508-at-combinations.sh
t/t3200-branch.sh
t/t5516-fetch-push.sh
t/t9903-bash-prompt.sh
t/test-lib.sh
transport.c
transport.h