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

1051 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Peter Cottle
9fa8c1383d yay got multiple remotes fetching working 2013-10-06 18:09:38 -07:00
Peter Cottle
a16204fea3 rebuild for content on lesson 1 2013-10-06 17:17:26 -07:00
Peter Cottle
00a843754e rebuild for fb page post 2013-10-06 17:02:12 -07:00
Peter Cottle
e053e4003a todo 2013-10-06 16:59:37 -07:00
Peter Cottle
409ef1c4dc sweet so glad i got test coverage 2013-10-06 16:50:53 -07:00
Peter Cottle
2904e94ef8 awesome test coverage 2013-10-06 16:47:23 -07:00
Peter Cottle
0c95e975ec YES AWESOME got make origin working with headless somehow in crazy 2013-10-06 16:33:30 -07:00
Peter Cottle
c0e395ad35 fetch level 2013-10-06 16:14:15 -07:00
Peter Cottle
dd64536615 ugh ugly bug again with origin loading so sad 2013-10-06 16:13:40 -07:00
Peter Cottle
11074dba64 ugly bug around unescaping 2013-10-06 15:49:59 -07:00
Peter Cottle
bbf837a4b2 ugly ugly bug with circular fields 2013-10-06 15:12:21 -07:00
Peter Cottle
1ed8a2524a misc work 2013-10-06 14:30:50 -07:00
Peter Cottle
906216d98b ugh annoying teardown bug 2013-10-06 13:16:30 -07:00
Peter Cottle
33e5060ac7 better highlighting with keyboard events for level dropdown view 2013-10-06 11:49:18 -07:00
Peter Cottle
9e24c2dfa2 Issue #109 Elaborate more on relative refs number 2 level 2013-10-06 11:41:32 -07:00
Peter Cottle
b19a1e2bc5 Issue #127 Ridiculously silly typo 2013-10-06 11:29:59 -07:00
Peter Cottle
2f9437cbb2 Issue #126 remove usage of upstream and downstream 2013-09-27 20:39:32 -07:00
Peter Cottle
cfea67ecce fixes remote branch grabbing 2013-09-09 12:15:46 -07:00
Peter Cottle
6291baf665 refreshing prod since glone si broken there 2013-09-09 11:42:57 -07:00
Peter Cottle
3d40125e75 color animation 2013-09-01 12:26:01 -07:00
Peter Cottle
3ff56c002c color animation 2013-09-01 12:24:20 -07:00
Peter Cottle
9ee683a29f correctness on fetch 2013-09-01 12:17:54 -07:00
Peter Cottle
9840a5e6b4 correctness on fetch 2013-09-01 12:16:46 -07:00
Peter Cottle
7cec1bcaab now multi origin fetch works 2013-09-01 11:55:28 -07:00
Peter Cottle
d6c89f913f Issue #123 2013-08-22 19:49:44 -07:00
Peter Cottle
fc502bcdaf rebuild for Issue #121 Pull #121 2013-08-05 20:43:10 -07:00
Peter Cottle
4815a6f30b WIP 2013-08-05 20:41:44 -07:00
Peter Cottle
62e56861cf Merge pull request #121 from gumpcha/fix-typo 
Fixed typo in InteractiveRebase level.
 2013-08-05 20:41:25 -07:00
Hyunjin CHA
aa985aba6a Fixed typo in InteractiveRebase level. 2013-08-06 10:50:38 +09:00
Peter Cottle
d75489c175 making sandbox first class 2013-08-04 15:09:11 -07:00
Peter Cottle
90ae34f37b todo update 2013-08-04 14:43:36 -07:00
Peter Cottle
65bfab372a with rebase above and below 2013-08-04 14:43:16 -07:00
Peter Cottle
6a48f2fff4 now rebase coverage 2013-08-04 14:35:38 -07:00
Peter Cottle
cb47dd2728 asd 2013-08-04 13:31:24 -07:00