mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-05 12:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1835 commits 7 branches 0 tags 104 MiB
Commit graph

1835 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
7225e9b7e6 Change fetch arguments up a bit, start migrating 2013-10-16 19:41:59 -07:00
Peter Cottle
e5b4ac5b1c now executing all codepaths for git push args, need to fix level still though 2013-10-15 17:36:29 -07:00
Peter Cottle
e99b6d7c61 awesome nailed down the actual args and stuff 2013-10-15 17:25:55 -07:00
Peter Cottle
bf48e54bbe sweet command line util to make test cases 2013-10-15 17:00:28 -07:00
Peter Cottle
15e8877e95 notes for arguments 2013-10-15 15:30:34 -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
04ce98fd7f readme for Pull #140 2013-10-14 17:49:05 -07:00
Peter Cottle
fadca6960a Merge pull request #140 from piuccio/master 
One or two type
 2013-10-14 17:47:35 -07:00
Crisci, Fabio | Piuccio | TRVDD
b24f443266 Typo 2013-10-15 08:42:05 +09:00
Peter Cottle
f543fa4485 awesome fixed push for everythinggs 2013-10-14 14:19:29 -07:00
Peter Cottle
56e800220c BOOM have testing back in the HOUSEEee 2013-10-14 13:36:55 -07:00
Peter Cottle
9365a95587 streak 2013-10-13 21:49:08 -07:00
Peter Cottle
e6996dce52 test stuff 2013-10-12 23:20:49 -07:00
Peter Cottle
84429b1d68 readme for #139 2013-10-12 23:18:39 -07:00
Peter Cottle
052aa26f10 fix for clone level Resolves #139 2013-10-12 23:17:35 -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
ec6044d07c test new build part 2 2013-10-11 12:52:31 -07:00
Peter Cottle
f8970c9f33 test new build thing 2013-10-11 12:51:55 -07:00
Peter Cottle
df0256d26b More clowntown on Issue #136 fix jasmine test 2013-10-11 12:10:56 -07:00
Peter Cottle
1a3f21175a Awesome tabs working for the levels 2013-10-10 19:20:14 -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
Peter Cottle
b2321dd265 Resolves #132 -- checking out remote branches sets tracking 2013-10-09 21:28:40 -07:00
Peter Cottle
c2cab4c12a Resolves #133 content for first lesson slide 2013-10-09 21:18:25 -07:00
Peter Cottle
6769634217 Issue #128 Preserve Merges for rebase 2013-10-09 21:10:29 -07:00
Peter Cottle
c18433766f readme for Pull Request #136 2013-10-09 14:28:22 -07:00
Peter Cottle
eb3c8f031a rebuild for Pull Request #136 2013-10-09 14:27:09 -07:00
Peter Cottle
68a58102cb Merge of Pull Request #136 Issue #136 2013-10-09 14:26:57 -07:00
Peter Cottle
55f54a8aa2 comparison settings 2013-10-08 12:56:25 -07:00
Peter Cottle
b13d6946e9 comparison settings 2013-10-08 12:56:17 -07:00
Peter Cottle
f963c4ea0a nother level 2013-10-08 12:30:00 -07:00
Max Sikström
14298d5acf Add a string for bad-tag-name 
Signed-off-by: Max Sikström <msikstrom@op5.com>
 2013-10-08 21:17:02 +02:00
Max Sikström
971c9b5f6f Revert index.html and bundle to keep pull request small 
Signed-off-by: Max Sikström <msikstrom@op5.com>
 2013-10-08 21:06:22 +02:00
Max Sikström
7a06cfd0c7 Cleanup + fixed a typo 
A typo (TagsCollection vs. TagCollection) made levels crash when loading.

There where still lot of stuff left for handling master branch in the visTag
code, because visTag is a modified version of the visBranch-object. Therefore,
clean up asome unused code

Signed-off-by: Max Sikström <msikstrom@op5.com>
 2013-10-08 20:48:05 +02:00
Peter Cottle
302e131189 advanced levels 2013-10-08 11:25:25 -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
fa7b918be9 more levels 2013-10-07 21:21:18 -07:00
Peter Cottle
541ae67fbd fixed tests 2013-10-07 16:54:54 -07:00
Peter Cottle
9e3b9cd911 another level 2013-10-07 15:12:16 -07:00
Peter Cottle
fe551e4df4 ugh rerecorded all tests after changing tree saving and loading behavior 2013-10-07 13:53:01 -07:00
Peter Cottle
241a2dcd1c level content work 2013-10-07 12:50:05 -07:00
Peter Cottle
a7a07e9f92 new remote branch level 2013-10-07 12:42:04 -07: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
97bcd2bb31 yay got multiple remotes fetching working 2013-10-06 18:10:51 -07:00