Commit graph

189 commits

Author SHA1 Message Date
Peter Cottle
854b5d44b0 Resolves #362 allow deleting commits with push force 2016-02-29 09:27:23 -08:00
Peter Cottle
2257668f9d got rid of every underscore bind i think -- 1500 line diff 2015-04-20 16:41:56 +10:00
Peter Cottle
b3cf8263a2 removed all horrible hack references 2015-04-04 11:24:49 -07:00
Peter Cottle
0456426949 fix typo in comment so i dont say ammend again. Issue #233 PR #234 2015-01-08 19:06:22 -08:00
Peter Cottle
7fc33541cc [FeatureRequest] git push --force beta Resolves #185 2014-11-29 17:34:37 -08:00
Peter Cottle
2f62817dff Issue #223 micro-optimization and test coverage 2014-11-29 16:38:09 -08:00
Peter Cottle
7b687ab6da [TargetSetDifference] Sort commits by dependencies Resolves #223 2014-11-29 16:34:57 -08:00
Peter Cottle
bf6a84dd1d [Fun] Issue #202 -- more fun when finishing! 2014-08-19 19:26:41 -07:00
Peter Cottle
2997891874 PR #196 whoops one more, double reverse = bad 2014-08-13 19:26:20 -07:00
Peter Cottle
90c39417bb PR #196 code cleanup and solution description rather than reordering 2014-08-13 19:22:45 -07:00
Patrick
00cc6349d0 Added extra flag to interactive rebase which accepts a list of commits (ordering counts). This list will then be shown to the user when the rebase dialog shows up when showing a solution that does an interactive rebase. This is so the user doesn't have to guess about what commits were picked and how they were ordered for the solution 2014-07-26 15:22:26 -04:00
Peter Cottle
2423646199 PR #195 bit of style cleanup and error handling and test for error handling 2014-07-26 21:40:45 +08:00
Patrick
72cc7d6bd3 Added testable interactive rebase. It doesn't fully test everything (mainly the GUI), but is a start 2014-07-24 17:43:59 -04:00
Peter Cottle
ecd848625b Resolves #184 interactive rebase upstream check 2014-06-30 20:50:01 -07:00
Peter Cottle
d01f1806b4 Issue #179 consolidate rebase -i and rebase codepaths 2014-06-29 15:57:44 -07:00
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