Merge branch 'maint-1.7.7' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:58:51 +0000 (21:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:58:51 +0000 (21:58 -0800)
commit8311158c66e0d83df950ea837fb1cb332c51f798
treed36f54375886bb0939416986d92aa8842ce29711
parent10dd3b2bf1444695416c0dac951297acf7d4e5e4
parent66c11f02b031aca6f1756086fefdf4b8a5575c56
Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
  Git 1.7.7.5
  Git 1.7.6.5
  blame: don't overflow time buffer
  fetch: create status table using strbuf
  checkout,merge: loosen overwriting untracked file check based on info/exclude
  cast variable in call to free() in builtin/diff.c and submodule.c
  apply: get rid of useless x < 0 comparison on a size_t type

Conflicts:
Documentation/git.txt
GIT-VERSION-GEN
RelNotes
builtin/fetch.c
Documentation/git.txt
builtin/apply.c
builtin/blame.c
builtin/checkout.c
builtin/fetch.c
builtin/merge.c
submodule.c