OSDN Git Service

Sync with 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:54:01 +0000 (13:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2013 20:54:01 +0000 (13:54 -0700)
* maint:
  Correct common spelling mistakes in comments and tests
  kwset: fix spelling in comments
  precompose-utf8: fix spelling of "want" in error message
  compat/nedmalloc: fix spelling in comments
  compat/regex: fix spelling and grammar in comments
  obstack: fix spelling of similar
  contrib/subtree: fix spelling of accidentally
  git-remote-mediawiki: spelling fixes
  doc: various spelling fixes
  fast-export: fix argument name in error messages
  Documentation: distinguish between ref and offset deltas in pack-format
  i18n: make the translation of -u advice in one go

12 files changed:
1  2 
Documentation/revisions.txt
builtin/apply.c
builtin/fast-export.c
commit.c
commit.h
perl/Git.pm
sequencer.c
t/t4014-format-patch.sh
t/t4124-apply-ws-rule.sh
t/t6030-bisect-porcelain.sh
transport.h
wt-status.c

Simple merge
diff --cc builtin/apply.c
Simple merge
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
Simple merge
diff --cc perl/Git.pm
Simple merge
diff --cc sequencer.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc transport.h
Simple merge
diff --cc wt-status.c
Simple merge