mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-13 08:04:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1149 commits 7 branches 0 tags 104 MiB
Commit graph

248 commits

Author SHA1 Message Date
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
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
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
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
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
Peter Cottle
7db6f0d38c refactored to base compare 2013-08-04 12:55:49 -07:00
Peter Cottle
9e88510dc7 rename branches for hackathon demo 2013-08-01 13:04:41 -07:00
Peter Cottle
e7709223c3 before prototype forum 2013-08-01 12:19:58 -07:00
Siddharth Agarwal
f507ceb152 want 2013-08-01 11:53:25 -07:00
Peter Cottle
3246649cb6 now with hgdemo2 2013-08-01 11:21:25 -07:00
Peter Cottle
d52830f3d2 rebuild fix 2013-08-01 00:27:08 -07:00
Peter Cottle
8b66edc878 awesome have rebase done 2013-08-01 00:20:28 -07:00
Peter Cottle
edb4f0dc2a WIP 2013-07-31 22:20:55 -07:00
Peter Cottle
bd95734751 WIP 2013-07-31 19:47:21 -07:00
Peter Cottle
37a9fccec0 wip 2013-07-31 16:54:06 -07:00
Peter Cottle
0f1c9c4e7a [Hackathon] Hg mode initial 2013-07-31 13:44:13 -07:00
Siddharth Agarwal
31f175fbc7 use better names for command configs 2013-07-31 02:18:51 -07:00
Siddharth Agarwal
e4c0b4786c add an hg commands module 2013-07-31 02:17:27 -07:00
Siddharth Agarwal
05cadae5d8 move generic command handling to commands/index.js 2013-07-31 02:00:42 -07:00
Siddharth Agarwal
c3e58b3063 rename commandConfig to gitCommandConfig 2013-07-31 01:40:12 -07:00
Siddharth Agarwal
1402136bb2 add an hg command config 2013-07-31 01:38:55 -07:00
Siddharth Agarwal
9f7fa32820 fix lint issue 2013-07-31 01:25:33 -07:00
Siddharth Agarwal
7f43138665 make execute take the vcs as well 2013-07-31 01:24:03 -07:00
Siddharth Agarwal
d04817f7d1 remove getRegex since it is no longer used 2013-07-31 01:07:51 -07:00
Siddharth Agarwal
9821df3bb7 turn getCommandsThatCount into a map 2013-07-31 01:06:35 -07:00