174 commits

Author	SHA1	Message	Date
Peter Cottle	43579378e8	Resolves #164 case insensitive branch comparison with test and validation	2014-02-27 12:11:48 -08:00
Peter Cottle	0be3577572	Resolves #160 handle case where the rebase is empty and theres nothing to do during git pull --rebase	2014-02-12 14:20:09 -08:00
Peter Cottle	e7d9b76b98	moved another function to graph	2013-12-23 10:15:16 -08:00
Peter Cottle	d27e28b109	describe level Resolves #144 Wooooo	2013-11-05 09:13:16 -08:00
Peter Cottle	c3f0f48f28	Issue #144 describe support for command	2013-11-04 18:39:51 -08:00
Peter Cottle	625c15d51e	now with errors	2013-11-01 18:48:13 -07:00
Peter Cottle	9fbe654cb2	got tags making commits not faded out or orphaned anymore	2013-11-01 10:01:13 -07:00
Peter Cottle	f9f9d98628	think moving method worked	2013-10-29 20:53:19 -07:00
Peter Cottle	88d5902956	vistag now working in tests	2013-10-29 19:35:23 -07:00
Peter Cottle	7bbc81de97	tag loading from trees now works	2013-10-29 09:57:46 -07:00
Peter Cottle	5a66b762ce	code move	2013-10-28 19:49:10 -07:00
Peter Cottle	0112b3f839	beginning of graph file	2013-10-28 16:19:16 -07:00
Peter Cottle	ebfd5e84d2	Merge branch 'tagSupport' Pull Request #137 Issue #134 ... Conflicts: src/js/git/index.js	2013-10-27 12:37:48 -07:00
Peter Cottle	e96df309e5	default tags to empty set on export Pull Request #137	2013-10-27 12:33:20 -07:00
Peter Cottle	dc8df68dac	push args done	2013-10-26 14:14:08 -07:00
Peter Cottle	c522722513	much better interaction on levels keys with tabs	2013-10-26 12:46:19 -07:00
Peter Cottle	cdd93a99e0	ok sweet progress	2013-10-26 12:11:10 -07:00
Peter Cottle	db14af2fa7	fetch fixes	2013-10-26 12:04:33 -07:00
Peter Cottle	bc20fc163b	sLICKK	2013-10-25 18:41:06 -07:00
Peter Cottle	016f0f45f1	sweet new level	2013-10-25 17:54:50 -07:00
Peter Cottle	e62a93452f	bugfix	2013-10-24 19:50:34 -07:00
Peter Cottle	b8cf7f75c0	yay all tests pass and big git pull update	2013-10-22 10:56:35 -07:00
Peter Cottle	99bf9bacd3	big progress on fetch	2013-10-22 09:42:18 -07:00
Peter Cottle	f11f76bbe8	BOOM all tests pass, more progress on git fetch	2013-10-17 19:49:17 -07:00
Peter Cottle	b9ebaca62b	more argument and test progress	2013-10-17 11:33:41 -07:00
Peter Cottle	7225e9b7e6	Change fetch arguments up a bit, start migrating	2013-10-16 19:41:59 -07:00
Peter Cottle	3dd5102e2a	more push madness	2013-10-14 18:33:56 -07:00
Peter Cottle	d3c0fc40a3	more remote tests	2013-10-14 18:20:45 -07:00
Peter Cottle	f543fa4485	awesome fixed push for everythinggs	2013-10-14 14:19:29 -07:00
Peter Cottle	e6996dce52	test stuff	2013-10-12 23:20:49 -07:00
Peter Cottle	9bf99ebff3	WIP bad	2013-10-12 23:07:14 -07:00
Peter Cottle	068b9b961e	small change to test new build stuff	2013-10-11 12:59:12 -07:00
Peter Cottle	db78bad106	Fix --no-ff for real usage, Pull Request #136 clowntown by me thanks @nem75	2013-10-10 14:30:55 -07:00
Peter Cottle	f930bae005	Support for push refspecs with colon, aka master:master or :foo	2013-10-09 22:29:05 -07:00
Peter Cottle	748eddbd86	get rid of local branches that trick this since not needed	2013-10-09 21:40:44 -07:00
Peter Cottle	b2321dd265	Resolves #132 -- checking out remote branches sets tracking	2013-10-09 21:28:40 -07:00
Peter Cottle	6769634217	Issue #128 Preserve Merges for rebase	2013-10-09 21:10:29 -07:00
Peter Cottle	68a58102cb	Merge of Pull Request #136 Issue #136	2013-10-09 14:26:57 -07:00
Max Sikström	74342e2028	Git Tag: Initial support for tagging ... Branching in git even more useful if using tags. Simulate relase branches, maintenance branches and so on is therefore really useful in this tool. Now, rudimentary tagging is implemented, where tags can be attached to the commits, and referenced by for exmapmle git checkout Signed-off-by: Max Sikström <msikstrom@op5.com>	2013-10-08 19:12:48 +02:00
Peter Cottle	bfd8483d90	Issue #129 pushing to different remote branches	2013-10-07 11:29:08 -07:00
Peter Cottle	7034eb76fa	Issue #131 awesomely now respect remote tracking branch info for git pull	2013-10-06 23:52:33 -07:00
Peter Cottle	79d65e739a	Issue #130 -- slightly odd rebase animation fixed	2013-10-06 22:48:04 -07:00
Peter Cottle	73660f7126	Issue #130 -- hangs after pull uncaught result	2013-10-06 22:34:51 -07:00
Peter Cottle	9fa8c1383d	yay got multiple remotes fetching working	2013-10-06 18:09:38 -07:00
Peter Cottle	dd64536615	ugh ugly bug again with origin loading so sad	2013-10-06 16:13:40 -07:00
Peter Cottle	11074dba64	ugly bug around unescaping	2013-10-06 15:49:59 -07:00
Peter Cottle	bbf837a4b2	ugly ugly bug with circular fields	2013-10-06 15:12:21 -07:00
Peter Cottle	1ed8a2524a	misc work	2013-10-06 14:30:50 -07:00
Peter Cottle	906216d98b	ugh annoying teardown bug	2013-10-06 13:16:30 -07:00
Peter Cottle	cfea67ecce	fixes remote branch grabbing	2013-09-09 12:15:46 -07:00