From: Junio C Hamano <junkio@cox.net>
Date: Thu, 9 Nov 2006 23:08:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=368c2ac249ac2261784e1b9b9bc7c98c5e859052;p=git.git

Merge branch 'maint'

* 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
---

368c2ac249ac2261784e1b9b9bc7c98c5e859052