189 commits

Author	SHA1	Message	Date
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
Peter Cottle	6291baf665	refreshing prod since glone si broken there	2013-09-09 11:42:57 -07:00
Peter Cottle	3d40125e75	color animation	2013-09-01 12:26:01 -07:00
Peter Cottle	3ff56c002c	color animation	2013-09-01 12:24:20 -07:00
Peter Cottle	9ee683a29f	correctness on fetch	2013-09-01 12:17:54 -07:00
Peter Cottle	9840a5e6b4	correctness on fetch	2013-09-01 12:16:46 -07:00
Peter Cottle	7cec1bcaab	now multi origin fetch works	2013-09-01 11:55:28 -07:00
Peter Cottle	d6c89f913f	Issue #123	2013-08-22 19:49:44 -07:00
Peter Cottle	4815a6f30b	WIP	2013-08-05 20:41:44 -07:00
Peter Cottle	6a48f2fff4	now rebase coverage	2013-08-04 14:35:38 -07:00
Peter Cottle	9e88510dc7	rename branches for hackathon demo	2013-08-01 13:04:41 -07:00
Peter Cottle	e7709223c3	before prototype forum	2013-08-01 12:19:58 -07:00
Peter Cottle	3246649cb6	now with hgdemo2	2013-08-01 11:21:25 -07:00
Peter Cottle	d52830f3d2	rebuild fix	2013-08-01 00:27:08 -07:00
Peter Cottle	8b66edc878	awesome have rebase done	2013-08-01 00:20:28 -07:00
Peter Cottle	edb4f0dc2a	WIP	2013-07-31 22:20:55 -07:00
Peter Cottle	bd95734751	WIP	2013-07-31 19:47:21 -07:00
Peter Cottle	37a9fccec0	wip	2013-07-31 16:54:06 -07:00
Peter Cottle	0f1c9c4e7a	[Hackathon] Hg mode initial	2013-07-31 13:44:13 -07:00
Siddharth Agarwal	05cadae5d8	move generic command handling to commands/index.js	2013-07-31 02:00:42 -07:00
Siddharth Agarwal	7f43138665	make execute take the vcs as well	2013-07-31 01:24:03 -07:00
Siddharth Agarwal	ecbe9cb19a	Move commands/index.js to git/commands.js	2013-07-30 21:04:50 -07:00
Peter Cottle	d4d7fb21c7	BOOM two new awesome levels before rebase 9000	2013-07-28 18:19:15 -07:00
Peter Cottle	0aadae766f	big refactor looking a lot better now	2013-07-28 12:12:00 -07:00
Peter Cottle	e422bdb181	big commands refactor in prep for hackathon	2013-07-27 23:49:27 -07:00
Peter Cottle	5ec8a2916f	big command factoring	2013-07-27 22:46:46 -07:00
Peter Cottle	c4ae821cef	AWESOME origin compare within trees and levels, visualizations down, finish animation chain fixed, everything is awesome here. ready fororigin levels	2013-07-24 21:41:53 -07:00
Peter Cottle	debd5f9fed	one more test	2013-07-24 09:57:21 -07:00
Peter Cottle	a95a56241b	Finally fixed async git dispatching and promise chains, fixed rebase level Issue #111	2013-07-21 18:40:26 -07:00
Peter Cottle	380bcfaa4b	fake teamwork better	2013-07-16 09:13:11 -07:00
Peter Cottle	62867c9f43	fake teamwork better	2013-07-16 09:11:26 -07:00
Peter Cottle	f7af08c5fe	finally have get string now	2013-07-12 18:28:45 -07:00
Peter Cottle	67570f716d	fixed merge case with existing commits	2013-07-07 14:06:25 -07:00
Peter Cottle	87c787c8af	before test fix	2013-07-07 12:43:02 -07:00
Peter Cottle	f682f42aa0	starting on push bug for git merge C3;git merge master;go master;git merge side;git push;gc; git reset HEAD~1; git clone; gc; git merge C2; git push;	2013-07-05 09:58:57 -07:00
Peter Cottle	e382004a55	Removed one TODO -- better cloning of all branches, origin/master setup automatically, and fake teamwork anywhere	2013-07-04 18:09:53 -07:00