summaryrefslogtreecommitdiff
path: root/git-subtree.sh
AgeCommit message (Expand)AuthorFilesLines
2009-04-30Abort if --rejoin fails.Libravatar Avery Pennarun1-1/+1
2009-04-26debug messages are off by default; use -d to enable.Libravatar Avery Pennarun1-2/+18
2009-04-26Simplify merges even more aggressively.Libravatar Avery Pennarun1-1/+1
2009-04-26Only copy a commit if it has at least one nonidentical parent.Libravatar Avery Pennarun1-1/+4
2009-04-26Trim some extra merge commits that don't need to go into the split tree.Libravatar Avery Pennarun1-3/+16
2009-04-26Clarify why we can't do 'git rev-list' with a path.Libravatar Avery Pennarun1-3/+3
2009-04-26Typo when searching for existing splits.Libravatar Avery Pennarun1-1/+1
2009-04-26Add --annotate option, and create recognizable file content during tests.Libravatar Avery Pennarun1-1/+5
2009-04-25Handle it successfully if a given parent commit has no parents.Libravatar Avery Pennarun1-1/+12
2009-04-24Add 'git subtree merge' and 'git subtree pull'.Libravatar Avery Pennarun1-15/+40
2009-04-24Add a new 'git subtree add' command for adding subtrees from a given rev.Libravatar Avery Pennarun1-3/+53
2009-04-24Pass the path using the --prefix option instead of on the command line.Libravatar Avery Pennarun1-12/+16
2009-04-24Okay, that was a little too aggressive.Libravatar Avery Pennarun1-14/+32
2009-04-24Even more aggressive commit trimming.Libravatar Avery Pennarun1-10/+24
2009-04-24Prune out some extra merge commits by comparing their parents correctly.Libravatar Avery Pennarun1-5/+13
2009-04-24Quick test script for generating reasonably complex merge scenarios.Libravatar Avery Pennarun1-2/+3
2009-04-24Skip over empty commits.Libravatar Avery Pennarun1-13/+42
2009-04-24Hmm... can't actually filter rev-list on the subdir name.Libravatar Avery Pennarun1-6/+9
2009-04-24Added a --onto option, but it's so complicated I can't tell if it works.Libravatar Avery Pennarun1-1/+11
2009-04-24Use information about prior splits to make sure merges work right.Libravatar Avery Pennarun1-4/+36
2009-04-24Add a new --rejoin option.Libravatar Avery Pennarun1-9/+44
2009-04-24Print out the newly created commitid at the end, for use in other scripts.Libravatar Avery Pennarun1-2/+7
2009-04-24We now copy the other stuff about a commit (changelog, author, etc).Libravatar Avery Pennarun1-4/+21
2009-04-24'git subtree split' now basically works.Libravatar Avery Pennarun1-4/+18
2009-04-24basic options parsing and whatnot.Libravatar Avery Pennarun1-0/+123