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

100 commits

Author SHA1 Message Date
Peter Cottle
246753caad have revert and cherry pick 2013-06-04 15:13:33 -10:00
Peter Cottle
f400ac238e have cherry pick but forgot highlight 2013-06-04 14:58:49 -10:00
Peter Cottle
733ad7d648 heck yes rebase finished 2013-06-04 14:50:11 -10:00
Peter Cottle
8eff13284f rebase started 2013-06-04 14:48:36 -10:00
Peter Cottle
6931992316 revert all done 2013-06-04 14:34:47 -10:00
Peter Cottle
a8fce5a4ab awesome revert highlight down 2013-06-04 14:31:14 -10:00
Peter Cottle
2e10b6c173 revert partway 2013-06-04 10:44:26 -10:00
Peter Cottle
ec1bab114f revert partway 2013-06-04 10:38:26 -10:00
Peter Cottle
880e1ca630 animation work 2013-06-04 10:26:50 -10:00
Peter Cottle
2ba6065a0d starting revert animation change 2013-06-04 09:56:35 -10:00
Peter Cottle
19c0ee0ef4 bt now weirdly the animation deonst fire at first, look into it 2013-06-02 17:45:34 -07:00
Peter Cottle
b69c35d548 know why its beause git engine ready is async and we dont have origin until that fires so animation gets messed up 2013-06-02 17:43:56 -07:00
Peter Cottle
f438948660 awesome now we are using it for commit animations 2013-06-02 17:35:55 -07:00
Peter Cottle
c8d117073f AWESSOMEEE now converted animation queue to promise based too 2013-06-02 17:32:34 -07:00
Peter Cottle
4619eb370c AWESOMEEEEEe first big refactor and its awesome 2013-06-02 17:20:13 -07:00
Peter Cottle
bf6f987482 in the midle of teamwork reorg why does promise not defer? 2013-06-02 17:16:14 -07:00
Peter Cottle
292126437a more test coverage which is always good :D 2013-06-02 16:59:16 -07:00
Peter Cottle
aba8265a00 [Origin] few updates 2013-05-27 11:04:47 -07:00
Peter Cottle
29415cb525 [Origin] git pull done wow that was easy 2013-05-27 10:56:35 -07:00
Peter Cottle
a24f62420d [Origin] Some origin work around remote branches 2013-05-27 10:31:50 -07:00
Peter Cottle
6080d324ce [Origin] Implement basic git fetch force need to fix up animations 2013-05-26 23:44:07 -07:00
Peter Cottle
3a23973a9a fake teamwork done 2013-05-26 21:58:57 -07:00
Peter Cottle
cbcd489a31 [Origin] wow have tree string and undo working flawlessly, somewhat hacky but very robust all things considered 2013-05-26 18:21:38 -07:00
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
f9cdc32fcb WOOHOOOOOOO assertion engine complete. Issue #28 this is crazy 2013-03-10 12:11:01 -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
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
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
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