What's in git.git (Jun 2009, #02; Mon, 22)

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 22, 2009, 07:57 UTC
Message-ID: <7vvdmoem5q.fsf@alter.siamese.dyndns.org>

The 'maint' branch gave birth to v1.6.3.3 tonight. There are still a handful of fixes that are already in 'master' but have not been backmerged for v1.6.3.X series; hopefully we can flush them all and make v1.6.3.4 the final one before 'master' starts the rc freeze for v1.6.4.

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

Johannes Sixt (1):
  t3700-add: add a POSIXPERM prerequisite to a new test

Stephen Boyd (1):
  add: allow configurations to be overriden by command line

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

Alex Bennée (1):
  Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS
    working tree before applying commit patch

Christian Stimming (1):
  gitk: Update German translation.

Dirk Süsserott (1):
  gitk: Add option 'Simple history' to the options menu

Elijah Newren (1):
  gitk: Make more options easily accessible from Edit View dialog

Jim Meyering (1):
  avoid NULL dereference on failed malloc

Johan Herland (1):
  git-submodule: add support for --merge.

Johannes Sixt (1):
  gitk: Use --textconv to generate diff text

Junio C Hamano (5):
  write-tree --ignore-cache-tree
  cache-tree.c::cache_tree_find(): simplify internal API
  t4007: modernize the style
  Optimize "diff-index --cached" using cache-tree
  Avoid "diff-index --cached" optimization under --find-copies-harder

Linus Torvalds (1):
  Fix various sparse warnings in the git source code

Markus Heidelberg (1):
  gitk: Allow diff view without context lines

Michael J Gruber (5):
  Allow push and fetch urls to be different
  t5516: Check pushurl config setting
  technical/api-remote: Describe new struct remote member pushurl
  builtin-remote: Show push urls as well
  builtin-remote: Make "remote -v" display push urls

Michele Ballabio (1):
  gitk: Add another string to translation

Paolo Bonzini (1):
  Test cccmd in t9001-send-email.sh and fix some bugs

Pat Thoyts (1):
  gitk: Handle msysGit version during version comparisons

Paul Mackerras (1):
  gitk: Check git version before using --textconv flag

Santi Béjar (3):
  parse-remote: function to get the tracking branch to be merge
  parse-remote: support default reflist in get_remote_merge_branch
  parse-remote: remove unused functions

Stephen Boyd (2):
  parse-options: make OPT_INTEGER's argh explicit
  parse-options: simplify usage argh handling