Merge branch 'ab/i18n-st'
commit6c80cd298a9f2f36ae4e741cf65d94b7c184fb82
authorJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:55:55 +0000 (1 17:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 2 Apr 2011 00:55:55 +0000 (1 17:55 -0700)
tree19e3199715bf364acf9537dcb4eeebc042ae0739
parent84dd63ee1d6ce08d7b85e4f1c4d7e77ef27a1578
parentab8b53bbf1bd0cc078fe1f9772f9328fad59a203
Merge branch 'ab/i18n-st'

* ab/i18n-st: (69 commits)
  i18n: git-shortlog basic messages
  i18n: git-revert split up "could not revert/apply" message
  i18n: git-revert literal "me" messages
  i18n: git-revert "Your local changes" message
  i18n: git-revert basic messages
  i18n: git-notes GIT_NOTES_REWRITE_MODE error message
  i18n: git-notes basic commands
  i18n: git-gc "Auto packing the repository" message
  i18n: git-gc basic messages
  i18n: git-describe basic messages
  i18n: git-clean clean.requireForce messages
  i18n: git-clean basic messages
  i18n: git-bundle basic messages
  i18n: git-archive basic messages
  i18n: git-status "renamed: " message
  i18n: git-status "Initial commit" message
  i18n: git-status "Changes to be committed" message
  i18n: git-status shortstatus messages
  i18n: git-status "nothing to commit" messages
  i18n: git-status basic messages
  ...

Conflicts:
builtin/branch.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/grep.c
builtin/merge.c
builtin/push.c
builtin/revert.c
t/t3507-cherry-pick-conflict.sh
t/t7607-merge-overwrite.sh
27 files changed:
builtin/add.c
builtin/branch.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/describe.c
builtin/diff.c
builtin/fetch.c
builtin/grep.c
builtin/init-db.c
builtin/log.c
builtin/merge.c
builtin/notes.c
builtin/push.c
builtin/reset.c
builtin/revert.c
builtin/tag.c
t/t0001-init.sh
t/t3200-branch.sh
t/t3507-cherry-pick-conflict.sh
t/t4014-format-patch.sh
t/t5601-clone.sh
t/t6040-tracking-info.sh
t/t7201-co.sh
t/t7500-commit.sh
t/t7607-merge-overwrite.sh
wt-status.c