summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2009-08-12sort assertion to make it more genericLibravatar Amiel Martin1-1/+1
2009-08-12fixed order of assertion in testsLibravatar Amiel Martin1-1/+1
2009-08-02todo: idea for a 'git subtree grafts' commandLibravatar Avery Pennarun1-0/+3
2009-08-01todoLibravatar Avery Pennarun1-0/+2
2009-07-16todo^Libravatar Avery Pennarun1-0/+5
2009-07-10todoLibravatar Avery Pennarun1-0/+3
2009-07-08Docs: when pushing to github, the repo path needs to end in .gitLibravatar Avery Pennarun1-2/+2
2009-07-07todoLibravatar Avery Pennarun1-0/+2
2009-07-02Some todo items reported by pmccurdyLibravatar Avery Pennarun1-2/+21
2009-06-15update todoLibravatar Avery Pennarun1-0/+3
2009-05-30man page: add an EXAMPLES section.Libravatar Avery Pennarun1-0/+62
2009-05-30Add basic git-subtree manpage in asciidoc format.Libravatar Avery Pennarun6-0/+392
2009-05-30Make --squash work with the 'add' command too.Libravatar Avery Pennarun2-20/+44
2009-05-30Fix splitting after using a squash merge.Libravatar Avery Pennarun1-2/+6
2009-05-30Don't squash-merge if the old and new commits are the same.Libravatar Avery Pennarun1-0/+4
2009-05-30Basic "subtree merge --squash" support.Libravatar Avery Pennarun1-1/+77
2009-05-30merge_msg() is really more like rejoin_msg().Libravatar Avery Pennarun1-5/+8
2009-05-30FIXME help for --squash optionLibravatar Avery Pennarun1-0/+5
2009-05-30slightly rearrange help message for split.Libravatar Avery Pennarun1-2/+2
2009-05-30New --branch option to split command.Libravatar Avery Pennarun2-7/+29
2009-05-30typo in commentLibravatar Avery Pennarun1-1/+1
2009-05-24More to-do items based on feedbackLibravatar Avery Pennarun1-1/+13
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-26test.sh: oops, never intended to count the raw number of commits.Libravatar Avery Pennarun1-4/+3
2009-04-26Simplify merges even more aggressively.Libravatar Avery Pennarun1-1/+1
2009-04-26test.sh: make sure no commit changes more than one file at a time.Libravatar Avery Pennarun1-0/+34
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 Pennarun2-18/+38
2009-04-26test.sh tweakLibravatar Avery Pennarun1-1/+4
2009-04-26Add some basic assertions to test.sh.Libravatar Avery Pennarun1-1/+72
2009-04-26Add a 'create' helper function in test.sh.Libravatar Avery Pennarun1-15/+5
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 Pennarun2-31/+42
2009-04-26todo listLibravatar Avery Pennarun1-0/+8
2009-04-25Change test.sh to test the new add, merge, and pull commands.Libravatar Avery Pennarun1-8/+4
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 Pennarun2-15/+19
2009-04-24Okay, that was a little too aggressive.Libravatar Avery Pennarun2-15/+36
2009-04-24Even more aggressive commit trimming.Libravatar Avery Pennarun2-11/+25
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 Pennarun2-2/+99
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