mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 08:50:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2873 commits 8 branches 0 tags 104 MiB
Commit graph

1016 commits

Author SHA1 Message Date
Peter Cottle
b9ebaca62b more argument and test progress 2013-10-17 11:33:41 -07:00
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
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
f543fa4485 awesome fixed push for everythinggs 2013-10-14 14:19:29 -07:00
Peter Cottle
e6996dce52 test stuff 2013-10-12 23:20:49 -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
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
6769634217 Issue #128 Preserve Merges for rebase 2013-10-09 21:10:29 -07:00
Peter Cottle
68a58102cb Merge of Pull Request #136 Issue #136 2013-10-09 14:26:57 -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
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
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
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
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
9fa8c1383d yay got multiple remotes fetching working 2013-10-06 18:09:38 -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
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
b19a1e2bc5 Issue #127 Ridiculously silly typo 2013-10-06 11:29:59 -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
4815a6f30b WIP 2013-08-05 20:41:44 -07:00
Peter Cottle
d75489c175 making sandbox first class 2013-08-04 15:09:11 -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
4a41fbeba4 changed SupportedMap to OptionsMap 2013-08-04 13:30:08 -07:00