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

diff --git a/git-subtree.txt b/git-subtree.txt
index e7ce2d3654dcce65b2b983f3bc76bdd22ca939ec..9b2d48e334b2df98b6509ed778fe3d9a2764b177 100644 (file)
--- a/git-subtree.txt
+++ b/git-subtree.txt
@@ -258,7 +258,7 @@ And you can merge changes back in from the upstream project just
 as easily:
 
        $ git subtree pull --prefix=gitweb \
-               git@github.com:whatever/gitweb.git gitweb-latest:master
+               git@github.com:whatever/gitweb.git master
 
 Or, using '--squash', you can actually rewind to an earlier
 version of gitweb: