From: Junio C Hamano <junkio@cox.net>
Date: Mon, 9 Apr 2007 06:20:43 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~71
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d39d10d7fc3b391075201052ca8b090eb898eec0;p=git.git

Merge branch 'maint'

* maint:
  Add Documentation/cmd-list.made to .gitignore
  git-svn: fix log command to avoid infinite loop on long commit messages
  git-svn: dcommit/rebase confused by patches with git-svn-id: lines
  git-svn: bail out on incorrect command-line options
---

d39d10d7fc3b391075201052ca8b090eb898eec0