summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add 'contrib/subtree/' from commit '2e63f75b8f49abe220ef55ec4e978e7a3b8dc351'dg/subtreeDavid A. Greene2012-03-259-0/+2102
|\
| * Add Subtree Test MakefileDavid A. Greene2012-03-201-0/+69
| * Build SubtreeDavid A. Greene2012-03-201-13/+10
| * Use Project Config FilesDavid A. Greene2012-03-201-3/+6
| * Remove Unneeded FilesDavid A. Greene2012-03-207-165/+0
| * Set TEST_DIRECTORYDavid A. Greene2012-03-201-2/+4
| * Use Test HarnessDavid A. Greene2012-02-111-241/+405
| * Rename TestDavid A. Greene2012-02-111-0/+0
| * Move Tests Into SubdirectoryDavid A. Greene2012-02-111-0/+0
| * Skip commit objects that should be trees, rather than copying them.Avery Pennarun2011-02-281-0/+1
| * It's also okay if an expected tree object is actually a commit.Avery Pennarun2011-02-281-1/+1
| * Added check to order of processed commits.Jesse Greenwald2010-11-091-0/+28
| * Split cmd now processes commits in topo order.Jesse Greenwald2010-11-091-1/+1
| * Fix a few typos/grammar-o's in the preceding commit.Avery Pennarun2010-10-211-7/+7
| * docs: Description, synopsys, options and examples changes.John Yani2010-10-211-43/+69
| * Fixing eval syntax error.Cole Stanfield2010-10-211-1/+1
| * Fix typo: an -> aAvery Pennarun2010-08-121-1/+1
| * docs: simplify example 1Bryan Larsen2010-07-211-7/+3
| * Another fix for PATH and msysgit.Avery Pennarun2010-06-241-3/+1
| * Merge remote branch 'origin/master'Avery Pennarun2010-06-242-5/+26
| |\
| | * Fixed regression with splitting out new subtreePelle Wessman2010-05-202-1/+13
| | * Use 'git merge -Xsubtree' when git version >= 1.7.0.Pelle Wessman2010-05-071-4/+13
| * | (Hopefully) fix PATH setting for msysgit.Avery Pennarun2010-06-241-0/+4
| |/
| * Added new 'push' command and 2-parameter form of 'add'.Wayne Walter2010-02-134-18/+77
| * Docs: cleaning up example textual redundancyDan Sabath2010-02-081-3/+3
| * docs: add simple 'add' case to clarify setup.Dan Sabath2010-02-081-2/+26
| * Some recent tests accidentally depended on very new versions of git.Avery Pennarun2010-02-081-2/+2
| * Oops. Apparently I didn't run 'make test' after most recent change.Avery Pennarun2010-02-081-1/+2
| * Improve checking for existence of the --prefix directory.Avery Pennarun2010-02-082-3/+21
| * Make sure that <prefix> exists when splitting.Win Treese2010-02-062-0/+13
| * Make tests pass with recent git (1.7.0 and up).Avery Pennarun2010-02-061-1/+5
| * git-subtree.txt: add another example.Win Treese2010-02-051-2/+19
| * Jakub's changes broke the progress message slightly.Avery Pennarun2010-02-021-2/+1
| * Merge branch 'master' of git://github.com/psionides/git-subtreeAvery Pennarun2010-02-023-17/+164
| |\
| | * improved rev_is_descendant_of_branch() functionJakub Suder2010-01-121-2/+2
| | * added temporary test dirs to gitignoreJakub Suder2010-01-121-0/+2
| | * added tests for recent changesJakub Suder2010-01-121-2/+104
| | * fixed bug in commit message for splitJakub Suder2010-01-121-1/+1
| | * changed alias for --prefix from -p to -PJakub Suder2010-01-121-2/+2
| | * fix for subtree split not finding proper base for new commitsJakub Suder2010-01-101-1/+4
| | * allow using --branch with existing branches if it makes senseJakub Suder2010-01-101-8/+26
| | * added -m/--message option for setting merge commit messageJakub Suder2010-01-101-4/+26
| | * added -p alias for --prefixJakub Suder2010-01-061-2/+2
| * | Fix refspecs in given example for git subtree pull.Arlen Cuss2010-02-021-1/+1
| |/
| * Weird, I forgot to have 'make test' call test.sh.Avery Pennarun2009-11-201-0/+4
| * make git version dynamic when building documentationBen Walton2009-11-151-1/+3
| * add installation support to MakefileBen Walton2009-11-151-0/+20
| * Oops, forgot a COPYING file. It's GPLv2.Avery Pennarun2009-11-151-0/+339
| * Add some tips for how to install.Avery Pennarun2009-11-042-0/+14
| * cmd_pull didn't support --squash correctly.Avery Pennarun2009-10-021-2/+3