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

200 commits

Author SHA1 Message Date
Peter Cottle
2938c3fb37 Wow! Fix undo button and more origin work 2013-05-26 17:40:37 -07:00
Peter Cottle
5e151238c9 makes other vis and refreshes it out 2013-05-26 15:42:08 -07:00
Peter Cottle
29d401e701 makes other vis now too 2013-05-26 15:18:36 -07:00
Peter Cottle
9173e75c1a git originInit 2013-05-26 14:53:05 -07:00
Peter Cottle
0d865178b0 origin graphics should i do branch stack? 2013-05-14 10:23:32 -07:00
Peter Cottle
50a9eec959 meh 2013-05-13 19:41:47 -07:00
Peter Cottle
dd9f05eaa3 working on origin 2013-05-13 10:01:41 -07:00
Peter Cottle
e4b82fd653 bearable 2013-03-10 11:26:50 -07:00
Peter Cottle
e2ecfef4f4 Fixes Issue #68 flip logic and getCommitFromRef 2013-03-07 21:27:28 -08:00
Peter Cottle
3d01473ec4 sweet checkstrings 2013-03-03 15:58:57 -08:00
Peter Cottle
108ab07f93 ALL GIT STUFF DONE YES 2013-03-02 13:27:27 -08:00
Peter Cottle
9b4de12074 moar 2013-03-02 13:09:12 -08:00
Peter Cottle
efabfa4378 partway through git strings 2013-03-02 12:57:34 -08:00
Peter Cottle
80a540e172 Now can cherry pick multiple commits in a row like git usage Issue #57 2013-02-24 22:44:49 -08:00
Peter Cottle
7e165c6fdc zomg so many keys 2013-02-23 23:07:03 -08:00
Peter Cottle
2617357460 Basic dialog intl support for level dialogs, Issue #42 2013-02-23 13:32:45 -08:00
Peter Cottle
b6785b240c rebuild 2013-02-20 20:52:28 -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
Aaron Schrab
8da68375dd Remove obsolete numBackFrom method 
The numBackFrom method is no longer called from anywhere with the
changes from the previous commit to change how relative references are
handled.
 2013-02-20 18:12:53 -05:00
Aaron Schrab
e5de32f977 Improve parsing of relative references 
Support parsing of references like HEAD~^2~3^ .  Previously, ~ required
a following number, ^ didn't allow a following number, and chaining
wasn't supported.

If at any point in the resolving of the chain the requested parent isn't
found report the error by specifying the id of the last commit that was
found along with the parent specification to help the user to figure out
where the problem arose.
 2013-02-20 18:12:53 -05:00
Aaron Schrab
4928e71a4b Add getParent method for Commit objects 
Add method to retrieve a given parent (not ancestor) of a commit object.
If the commit doesn't have the requested parent return null.
 2013-02-20 18:12:53 -05: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
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
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
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
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
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
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
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
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
7722114fb0 animation factory now a this 2012-12-15 23:38:50 -08:00
Peter Cottle
36fd1437ca hmmm ok 2012-12-14 01:58:14 -08:00
Peter Cottle
dc1934cdd2 animation 2012-12-14 01:52:48 -08:00
Peter Cottle
69e435a8ec consolidation 2012-12-14 01:48:48 -08:00
Peter Cottle
6b125d194c consolidation 2012-12-14 01:44:59 -08:00
Peter Cottle
efd656059e much more sane 2012-12-14 01:40:43 -08:00
Renamed from src/git/index.js (Browse further)