From: Avery Pennarun <apenwarr@gmail.com>
Date: Tue, 2 Feb 2010 15:25:58 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/psionides/git-subtree
X-Git-Tag: v1.7.11-rc0~176^2~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b2f166e4e22a53c71dc8b67bd76b07d4539bf746;p=git.git

Merge branch 'master' of git://github.com/psionides/git-subtree

* 'master' of git://github.com/psionides/git-subtree:
  improved rev_is_descendant_of_branch() function
  added temporary test dirs to gitignore
  added tests for recent changes
  fixed bug in commit message for split
  changed alias for --prefix from -p to -P
  fix for subtree split not finding proper base for new commits
  allow using --branch with existing branches if it makes sense
  added -m/--message option for setting merge commit message
  added -p alias for --prefix
---

b2f166e4e22a53c71dc8b67bd76b07d4539bf746