mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 00:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
545 commits 7 branches 0 tags 102 MiB
Commit graph

56 commits

Author SHA1 Message Date
Peter Cottle
c50b413f3a Merge pull request #49 from aschrab/merge-args 
Fix merge argument handling
 2013-02-20 20:38:58 -08:00
Peter Cottle
9b59e47572 Fixes Issue #43 2013-02-20 20:03:51 -08:00
Aaron Schrab
4d6d247d01 No multiple arguments for merge 
`git merge` should only be given multiple arguments if doing an octopus
merge which isn't currently supported.  Require that exactly one
argument be given, and always use HEAD as the currentLocation.
 2013-02-20 22:46:45 -05:00
Peter Cottle
a2e89f592d Allow for multiple spaces in git commands Issue #44 2013-02-20 19:36:17 -08:00
Peter Cottle
c90444fe1e Better goal tree and hint and solution. Fixes Issue #37 2013-02-18 13:24:08 -08:00
Peter Cottle
bf6432b286 better tree comparsion from Issue #28 2013-02-18 09:36:52 -08:00
Peter Cottle
2a96052002 Recursive tree comparison algorithm that is hash agnostic to lay the groundwork for Issue #28 2013-02-18 09:10:08 -08:00
Peter Cottle
a954a659ce Rebuilding for Lukes pull 2013-02-18 07:41:30 -08:00
Luke Kysow
3732e4e98d Added common git aliases. 
git ci => git commit,
git co => git checkout,
git st => git status,
git br => git branch
 2013-02-17 22:05:06 -08:00
Peter Cottle
84a9adea01 fixes Issue #22 2013-02-17 03:34:34 -08:00
Peter Cottle
81c1d2402a Fixes Issue #4 2013-02-16 13:15:38 -08:00
Peter Cottle
d9050fd854 Sweet, fixed tests 2013-01-20 23:42:23 -08:00
Peter Cottle
ddaf71fc34 more bugs squashed 2013-01-12 13:12:35 -08:00
Peter Cottle
e844b5b25f bug squashed 2013-01-12 13:01:39 -08:00
Peter Cottle
4db83ba808 refresh fromt ree bug and clicik bug 2013-01-12 12:54:00 -08:00
Peter Cottle
a83a12b211 levle 4 cute 2013-01-12 01:50:18 -08:00
Peter Cottle
bde5681573 fixed a little rebase bug 2013-01-12 01:31:40 -08:00
Peter Cottle
9249ef0604 level 2 and 3 2013-01-12 01:02:48 -08:00
Peter Cottle
27498419c9 level arbiter beginning 2013-01-05 21:47:05 -08:00
Peter Cottle
953bd49ee2 die for levels 2013-01-05 13:53:00 -08:00
Peter Cottle
d5f456fa0c optimized CSS a bit 2013-01-05 12:35:37 -08:00
Peter Cottle
55c85cd439 deep in the hole trying to fix canvas positioning in visualizations 2013-01-04 13:13:15 -08:00
Peter Cottle
76b8a6cc9d better command counting 2013-01-03 17:47:30 -08:00
Peter Cottle
f4179e9723 sandbox command reset 2013-01-03 17:41:33 -08:00
Peter Cottle
1ec80eacf6 working on rebase datesortfunc 2013-01-03 15:03:49 -08:00
Peter Cottle
2e92e106d4 ok moved sandbox to a backbone view for inheritance 2013-01-03 12:37:55 -08:00
Peter Cottle
134cc9f748 awesome before and after deferreds working 2013-01-03 12:19:47 -08:00
Peter Cottle
4e6e82e698 there we go 2013-01-02 16:39:11 -08:00
Peter Cottle
2f57f4cfe3 OMG stupid typo 2013-01-02 16:38:15 -08:00
Peter Cottle
764fbf63bc able to open up views now from comand line 2013-01-02 11:57:16 -08:00
Peter Cottle
4aeb56c840 ok disbaled map is now just instants 2013-01-02 11:22:54 -08:00
Peter Cottle
4046916432 moving around 2013-01-02 11:14:46 -08:00
Peter Cottle
d497bea70c YAYYYyyy giatn refactor 2012-12-27 14:48:04 -08:00
Peter Cottle
a9d14521de moving command fucntionality 2012-12-27 13:42:43 -08:00
Peter Cottle
82d9e7a223 YAY looking a lot better, need to do rest of filter error 2012-12-25 18:27:50 -08:00
Peter Cottle
01fb9ec25b more progress 2012-12-25 18:08:02 -08:00
Peter Cottle
5e2bace639 slowly moving git command logic out of command model 2012-12-25 18:02:13 -08:00
Peter Cottle
bbdaa37abd before refactor 2012-12-25 17:39:31 -08:00
Peter Cottle
7d05c5167d nice have left and right view also 2012-12-20 12:16:40 -08:00
Peter Cottle
277f4f9209 nice modal view 2012-12-19 17:10:21 -08:00
Peter Cottle
39f6353f07 removed some hacky things for backbone 2012-12-19 11:14:45 -08:00
Peter Cottle
2b308e2ae9 awesome promise based interactive rebase with fail 2012-12-18 10:44:39 -08:00
Peter Cottle
ee6a81b35c much better test coverage now 2012-12-17 22:17:25 -08:00
Peter Cottle
620b438c5b finally got one unit test for git down. pretty cool actually 2012-12-17 20:56:28 -08:00
Peter Cottle
ddf399e099 almost can do tests 2012-12-17 11:26:50 -08:00
Peter Cottle
f34c606d87 omg finally works 2012-12-17 10:24:55 -08:00
Peter Cottle
aadeab8299 Trying to be able to test in node GAHHHH 2012-12-16 20:23:42 -08:00
Peter Cottle
c9fb851ad6 awesome, headless git now pretty much works 2012-12-16 18:35:24 -08:00
Peter Cottle
7722114fb0 animation factory now a this 2012-12-15 23:38:50 -08:00
Peter Cottle
a11dbfe280 tree compare 2012-12-14 02:01:01 -08:00