What's in git.git (Dec 2008, #04; Mon, 29)

What's in git.git (Dec 2008, #04; Mon, 29)

[Junio C Hamano]

This is the last installment of "What's in" series of the year 2008.
Enjoy a happy new year break, everybody.

* The 'maint' branch has these fixes since v1.6.1.

Adeodato Simó (2):
  git-shortlog.txt: improve documentation about .mailmap files
  git-send-email.txt: move --format-patch paragraph to a proper location

Devin Doucette (1):
  gitweb: Fix export check in git_get_projects_list

Junio C Hamano (1):
  Prepare for v1.6.1.1 maintenance release

René Scharfe (7):
  daemon: handle freopen() failure
  daemon: cleanup: replace loop with if
  daemon: cleanup: factor out xstrdup_tolower()
  merge-file: handle freopen() failure
  pretty: factor out skip_empty_lines()
  pretty: factor out format_subject()
  pretty: support multiline subjects with format:

Shawn O. Pearce (1):
  describe: Avoid unnecessary warning when using --all

jidanni@jidanni.org (1):
  Documentation/diff-options.txt: unify options


* The 'master' branch has these since the last announcement
  in addition to the above.

Johannes Schindelin (1):
  Force t5302 to use a single thread

Junio C Hamano (2):
  Document "git-reset --merge"
  Start 1.6.2 cycle

Linus Torvalds (1):
  Add 'merge' mode to 'git reset'

Nicolas Pitre (2):
  autodetect number of CPUs by default when using threads
  pack-objects: don't use too many threads with few objects

Teemu Likonen (2):
  Fix the building of user-manual.texi and gitman.texi documents
  Fix the building of gitman.info document