tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2010-01-12	added temporary test dirs to gitignore	Jakub Suder	1	-0/+2

2010-01-12	added tests for recent changes	Jakub Suder	1	-2/+104

2010-01-12	fixed bug in commit message for split	Jakub Suder	1	-1/+1

2010-01-12	changed alias for --prefix from -p to -P	Jakub Suder	1	-2/+2

2010-01-10	fix for subtree split not finding proper base for new commits	Jakub Suder	1	-1/+4

2010-01-10	allow using --branch with existing branches if it makes sense	Jakub Suder	1	-8/+26

2010-01-10	added -m/--message option for setting merge commit message	Jakub Suder	1	-4/+26

2010-01-06	added -p alias for --prefix	Jakub Suder	1	-2/+2

2009-11-20	Weird, I forgot to have 'make test' call test.sh.	Avery Pennarun	1	-0/+4

2009-11-15	make git version dynamic when building documentation	Ben Walton	1	-1/+3
	Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
2009-11-15	add installation support to Makefile	Ben Walton	1	-0/+20
	Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
2009-11-15	Oops, forgot a COPYING file. It's GPLv2.	Avery Pennarun	1	-0/+339
	Thanks to Ben Walton for pointing this out.
2009-11-04	Add some tips for how to install.	Avery Pennarun	2	-0/+14

2009-10-02	cmd_pull didn't support --squash correctly.	Avery Pennarun	1	-2/+3
	We should implement it as git fetch ... git subtree merge ... But we were instead just calling git pull -s subtree ... because 'git subtree merge' used to be just an alias for 'git merge -s subtree', but it no longer is.
2009-10-02	Fix a minor problem in identifying squashes vs. normal splits.	Avery Pennarun	1	-1/+3
	This didn't seem to have any noticeable side effects other than suspicious-looking log messages when you used -d.
2009-10-02	If someone provides a --prefix that ends with slash, strip the slash.	Avery Pennarun	3	-9/+5
	Prefixes that differ only in the trailing slash should be considered identical. Also update the test to check that this works.
2009-10-02	Merge branch 'master' of git://github.com/voxpelli/git-subtree	Avery Pennarun	1	-0/+1
	* 'master' of git://github.com/voxpelli/git-subtree: Check that the type of the tree really is a tree and not a commit as it seems to sometimes become when eg. a submodule has existed in the same position previously.
2009-10-02	Add a README that says to email me instead of using github mail.	Avery Pennarun	1	-0/+8
	What's with this new generation who hates email so much?
2009-09-30	Check that the type of the tree really is a tree and not a commit as it ↵	Pelle Wessman	1	-0/+1
	seems to sometimes become when eg. a submodule has existed in the same position previously.
2009-08-26	Fix behaviour if you have a branch named the same as your --prefix	Avery Pennarun	3	-7/+2
	We were trying to 'git checkout $prefix', which is ambiguous if $prefix names a directory and a branch. Do 'git checkout -- $prefix' instead. The main place this appeared was in 'git subtree add'. Reported by several people.
2009-08-26	Improve patch to use git --exec-path: add to PATH instead.	Avery Pennarun	1	-1/+2
	If you (like me) are using a modified git straight out of its source directory (ie. without installing), then --exec-path isn't actually correct. Add it to the PATH instead, so if it is correct, it'll work, but if it's not, we fall back to the previous behaviour.
2009-08-20	Add explicit path of git installation by 'git --exec-path'.	kTln2	1	-1/+1
	As pointed out by documentation, the correct use of 'git-sh-setup' is using $(git --exec-path) to avoid problems with not standard installations. Signed-off-by: gianluca.pacchiella <pacchiel@studenti.ph.unito.it>
2009-08-12	sort assertion to make it more generic	Amiel Martin	1	-1/+1

2009-08-12	fixed order of assertion in tests	Amiel Martin	1	-1/+1

2009-08-02	todo: idea for a 'git subtree grafts' command	Avery Pennarun	1	-0/+3

2009-08-01	todo	Avery Pennarun	1	-0/+2

2009-07-16	todo^	Avery Pennarun	1	-0/+5

2009-07-10	todo	Avery Pennarun	1	-0/+3

2009-07-08	Docs: when pushing to github, the repo path needs to end in .git	Avery Pennarun	1	-2/+2
	Reported by Thell Fowler.
2009-07-07	todo	Avery Pennarun	1	-0/+2

2009-07-02	Some todo items reported by pmccurdy	Avery Pennarun	1	-2/+21

2009-06-15	update todo	Avery Pennarun	1	-0/+3

2009-05-30	man page: add an EXAMPLES section.	Avery Pennarun	1	-0/+62

2009-05-30	Add basic git-subtree manpage in asciidoc format.	Avery Pennarun	6	-0/+392

2009-05-30	Make --squash work with the 'add' command too.	Avery Pennarun	2	-20/+44

2009-05-30	Fix splitting after using a squash merge.	Avery Pennarun	1	-2/+6

2009-05-30	Don't squash-merge if the old and new commits are the same.	Avery Pennarun	1	-0/+4

2009-05-30	Basic "subtree merge --squash" support.	Avery Pennarun	1	-1/+77
	Instead of merging in the history of the entire subproject, just squash it all into one commit, but try to at least track which commits we used so that we can do future merges correctly. Bonus feature: we can actually switch branches of the subproject this way, just by "squash merging" back and forth from one tag to another.
2009-05-30	merge_msg() is really more like rejoin_msg().	Avery Pennarun	1	-5/+8

2009-05-30	FIXME help for --squash option	Avery Pennarun	1	-0/+5

2009-05-30	slightly rearrange help message for split.	Avery Pennarun	1	-2/+2

2009-05-30	New --branch option to split command.	Avery Pennarun	2	-7/+29
	This is just a handy way to create a new branch from the newly-split subtree.
2009-05-30	typo in comment	Avery Pennarun	1	-1/+1

2009-05-24	More to-do items based on feedback	Avery Pennarun	1	-1/+13

2009-04-30	Abort if --rejoin fails.	Avery Pennarun	1	-1/+1
	Thanks to Eduardo Kienetz for noticing this.
2009-04-26	debug messages are off by default; use -d to enable.	Avery Pennarun	1	-2/+18
	Instead of debug messages, we print a progress counter to stderr.
2009-04-26	test.sh: oops, never intended to count the raw number of commits.	Avery Pennarun	1	-4/+3
	Just needed to make sure the count was non-zero.
2009-04-26	Simplify merges even more aggressively.	Avery Pennarun	1	-1/+1
	If any one of the parents is the same as the current one, then clearly the other parent branch isn't important, so throw it away entirely. Can't remember why I didn't do this before, but if I rediscover it, it definitely needs a unit test.
2009-04-26	test.sh: make sure no commit changes more than one file at a time.	Avery Pennarun	1	-0/+34

2009-04-26	Only copy a commit if it has at least one nonidentical parent.	Avery Pennarun	1	-1/+4
	This is a simplification of the previous logic. I don't think it'll break anything. Results in far fewer useless merge commmits when playing with gitweb in the git project: git subtree split --prefix=gitweb --annotate='(split) ' 0a8f4f0^^..f2e7330 --onto=1130ef3 ...and it doesn't seem to eliminate anything important.