Merge tag 'v2.0.0'
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 28 May 2014 23:38:15 +0000 (18:38 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Thu, 29 May 2014 00:34:51 +0000 (19:34 -0500)
commit4893eaa8f8fd65061c89c1edb73271eeca458395
treef08414f3ca4ca9932c89acb2410a662ae9dc1437
parent67e818239e7aa701037cce681b9742883d72eb0e
parente156455ea49124c140a67623f22a393db62d5d98
Merge tag 'v2.0.0'

Git 2.0

* tag 'v2.0.0': (385 commits)
  Git 2.0
  Update draft release notes to 2.0
  Git 2.0-rc4
  RelNotes/2.0.0.txt: Fix several grammar issues, notably a lack of hyphens, double quotes, or articles
  Revert "Merge branch 'jc/graduate-remote-hg-bzr' (early part)"
  remote-helpers: point at their upstream repositories
  contrib: remote-helpers: add move warnings (v2.0)
  Revert "Merge branch 'fc/transport-helper-sync-error-fix'"
  git-prompt.sh: don't assume the shell expands the value of PS1
  Documentation/technical/api-hashmap: remove source highlighting
  git-gui: tolerate major version changes when comparing the git version
  fr: a lot of good fixups
  request-pull: resurrect for-linus -> tags/for-linus DWIM
  contrib: completion: fix 'eread()' namespace
  l10n: Updated Bulgarian translation of git (1307t0f921u)
  Git 2.0-rc3
  Update draft release notes for 2.0
  l10n: Fix a couple of typos in the Swedish translation
  RelNotes/2.0.0: Grammar and typo fixes
  Git 2.0-rc2
  ...

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Conflicts:
Documentation/git-cherry-pick.txt
Documentation/git-reset.txt
Documentation/git-revert.txt
Documentation/git-stash.txt
Documentation/git-submodule.txt
GIT-VERSION-GEN
Makefile
builtin/add.c
builtin/commit.c
git-rebase--interactive.sh
git-remote-bzr.py
git-remote-hg.py
git-submodule.sh
remote.c
shared/git-prompt.sh
t/t5801-remote-helpers.sh
t/t5810-remote-hg.sh
t/t5811-remote-hg-bidi.sh
t/t5812-remote-hg-hg-git.sh
t/t5820-remote-bzr.sh
56 files changed:
.gitignore
Documentation/config.txt
Documentation/git-cherry-pick.txt
Documentation/git-commit.txt
Documentation/git-merge.txt
Documentation/git-push.txt
Documentation/git-rebase.txt
Documentation/git-reset.txt
Documentation/git-revert.txt
Documentation/git-stash.txt
Documentation/git-status.txt
Documentation/git-submodule.txt
Documentation/gitremote-helpers.txt
GIT-VERSION-GEN
Makefile
branch.c
builtin/add.c
builtin/apply.c
builtin/branch.c
builtin/commit.c
builtin/fetch.c
builtin/merge.c
builtin/push.c
builtin/reset.c
builtin/revert.c
builtin/rm.c
cache.h
commit.c
config.c
environment.c
fast-import.c
git-compat-util.h
git-rebase--interactive.sh
git-rebase.sh
git-submodule.sh
git.c
parse-options.c
parse-options.h
remote.c
remote.h
sequencer.c
sequencer.h
sha1_name.c
shared/git-completion.bash
shared/git-prompt.sh
t/t1300-repo-config.sh
t/t1305-config-include.sh
t/t3200-branch.sh
t/t3400-rebase.sh
t/t5801-remote-helpers.sh
t/t7001-mv.sh
t/t9903-bash-prompt.sh
t/test-lib.sh
transport-helper.c
transport.c
wt-status.c