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 /git-commit-script | |
| parent | e1ce417d0cb4bfe719efa07417c690b1ce0326e9 (diff) | |
| parent | 6bd910a82155ae3def5cf38acb27d36a192c449e (diff) | |
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 'git-commit-script')
0 files changed, 0 insertions, 0 deletions