Junio C Hamano 9c0d79d1de Merge branch 'jc/utf8' into next ...

* jc/utf8:
  Teach log family --encoding
  i18n.logToUTF8: convert commit log message to UTF-8
  Move encoding conversion routine out of mailinfo to utf8.c
  Document git-reset <commit> -- <paths>...
  Document --numstat in git-apply and git-diff
  show-branch --reflog: add documentation.
  add .mailmap for git-shortlog output with the git repository

Conflicts:

	commit.c

2006-12-26 00:54:06 -08:00

25 KiB

Raw Blame History

View Raw