diff options
| author |  Avery Pennarun <apenwarr@gmail.com> | 2010-02-02 10:25:58 -0500 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2010-02-02 10:25:58 -0500 |
| commit | b2f166e4e22a53c71dc8b67bd76b07d4539bf746 (patch) | |
| tree | 2e193c23a6e46762fc261731f6a317e49c99e7b3 /.gitignore | |
| parent | Fix refspecs in given example for git subtree pull. (diff) | |
| parent | improved rev_is_descendant_of_branch() function (diff) | |
| download | tgif-b2f166e4e22a53c71dc8b67bd76b07d4539bf746.tar.xz | |
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
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e358b18b78..7e77c9d022 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ *~ git-subtree.xml git-subtree.1 +mainline +subproj |