Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 01:56:02 +0000 (17:56 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 15 Feb 2006 01:56:02 +0000 (17:56 -0800)
commitbecb6a658c43633850a2417935c108266056b765
treebba1eba822e731c49f28b936189c8c8beb4a2300
parent65520c8e50ec227bc72e4196de03f785f850e5ad
parente8a1a11d4e0036a4205dbed533c135b51cd87218
Merge branch 'master'

* master:
  Merge branch 'kh/svn'
  git-svnimport: -r adds svn revision number to commit messages
  Merge branch 'jc/commit'
  commit: detect misspelled pathspec while making a partial commit.
  combine-diff: diff-files fix (#2)
  combine-diff: diff-files fix.
  Merge branch 'jc/rebase'
  Merge branch 'ra/email'
diff-files.c
ls-files.c