summaryrefslogtreecommitdiff
path: root/git-subtree.sh
AgeCommit message (Expand)AuthorFilesLines
2011-02-28Skip commit objects that should be trees, rather than copying them.Libravatar Avery Pennarun1-0/+1
2011-02-28It's also okay if an expected tree object is actually a commit.Libravatar Avery Pennarun1-1/+1
2010-11-09Added check to order of processed commits.Libravatar Jesse Greenwald1-0/+28
2010-11-09Split cmd now processes commits in topo order.Libravatar Jesse Greenwald1-1/+1
2010-10-21Fixing eval syntax error.Libravatar Cole Stanfield1-1/+1
2010-06-24Another fix for PATH and msysgit.Libravatar Avery Pennarun1-3/+1
2010-06-24Merge remote branch 'origin/master'Libravatar Avery Pennarun1-5/+17
2010-06-24(Hopefully) fix PATH setting for msysgit.Libravatar Avery Pennarun1-0/+4
2010-05-20Fixed regression with splitting out new subtreeLibravatar Pelle Wessman1-1/+4
2010-05-07Use 'git merge -Xsubtree' when git version >= 1.7.0.Libravatar Pelle Wessman1-4/+13
2010-02-13Added new 'push' command and 2-parameter form of 'add'.Libravatar Wayne Walter1-9/+49
2010-02-08Improve checking for existence of the --prefix directory.Libravatar Avery Pennarun1-3/+6
2010-02-06Make sure that <prefix> exists when splitting.Libravatar Win Treese1-0/+5
2010-02-06Make tests pass with recent git (1.7.0 and up).Libravatar Avery Pennarun1-1/+5
2010-02-02Jakub's changes broke the progress message slightly.Libravatar Avery Pennarun1-2/+1
2010-01-12improved rev_is_descendant_of_branch() functionLibravatar Jakub Suder1-2/+2
2010-01-12fixed bug in commit message for splitLibravatar Jakub Suder1-1/+1
2010-01-12changed alias for --prefix from -p to -PLibravatar Jakub Suder1-2/+2
2010-01-10fix for subtree split not finding proper base for new commitsLibravatar Jakub Suder1-1/+4
2010-01-10allow using --branch with existing branches if it makes senseLibravatar Jakub Suder1-8/+26
2010-01-10added -m/--message option for setting merge commit messageLibravatar Jakub Suder1-4/+26
2010-01-06added -p alias for --prefixLibravatar Jakub Suder1-2/+2
2009-10-02cmd_pull didn't support --squash correctly.Libravatar Avery Pennarun1-2/+3
2009-10-02Fix a minor problem in identifying squashes vs. normal splits.Libravatar Avery Pennarun1-1/+3
2009-10-02If someone provides a --prefix that ends with slash, strip the slash.Libravatar Avery Pennarun1-3/+3
2009-09-30Check that the type of the tree really is a tree and not a commit as it seems...Libravatar Pelle Wessman1-0/+1
2009-08-26Fix behaviour if you have a branch named the same as your --prefixLibravatar Avery Pennarun1-1/+1
2009-08-26Improve patch to use git --exec-path: add to PATH instead.Libravatar Avery Pennarun1-1/+2
2009-08-20Add explicit path of git installation by 'git --exec-path'.Libravatar kTln21-1/+1
2009-05-30Make --squash work with the 'add' command too.Libravatar Avery Pennarun1-18/+39
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 Pennarun1-2/+24
2009-05-30typo in commentLibravatar Avery Pennarun1-1/+1
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 04:28:13 +0000