Code

Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Thu, 9 Nov 2006 23:08:19 +0000 (15:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 9 Nov 2006 23:08:19 +0000 (15:08 -0800)
* maint:
  git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
  git-svn: fix dcommit losing changes when out-of-date from svn
  git-svn: don't die on rebuild when --upgrade is specified
  git-svn: avoid printing filenames of files we're not tracking


Trivial merge