Commit graph

102 commits

Author SHA1 Message Date
Peter Cottle
9bf99ebff3 WIP bad 2013-10-12 23:07:14 -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
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
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
9fa8c1383d yay got multiple remotes fetching working 2013-10-06 18:09:38 -07:00
Peter Cottle
1ed8a2524a misc work 2013-10-06 14:30:50 -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
e7709223c3 before prototype forum 2013-08-01 12:19:58 -07:00
Siddharth Agarwal
f507ceb152 want 2013-08-01 11:53:25 -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
Siddharth Agarwal
54414925fa add a vcs level to regex map 2013-07-31 00:28:59 -07:00
Siddharth Agarwal
3abe620cf1 add a vcs level to the option map 2013-07-31 00:06:47 -07:00
Siddharth Agarwal
d3f933ff2d add a vcs level to the option map 2013-07-31 00:06:07 -07:00
Siddharth Agarwal
b71e794e8e set vcs separately 2013-07-31 00:01:54 -07:00
Siddharth Agarwal
3c1887f1d0 add a vcs level to the shortcut map 2013-07-30 23:50:23 -07:00
Siddharth Agarwal
f14c128174 remove some dead code 2013-07-30 23:40:27 -07:00
Siddharth Agarwal
acf9c3c657 add the first hg command 2013-07-30 21:30:47 -07:00
Siddharth Agarwal
ecbe9cb19a Move commands/index.js to git/commands.js 2013-07-30 21:04:50 -07:00
Peter Cottle
0aadae766f big refactor looking a lot better now 2013-07-28 12:12:00 -07:00
Peter Cottle
c4ae821cef AWESOME origin compare within trees and levels, visualizations down, finish animation chain fixed, everything is awesome here. ready fororigin levels 2013-07-24 21:41:53 -07:00
Peter Cottle
c7da989845 awesome have part of git push working 2013-06-11 09:28:14 -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
9173e75c1a git originInit 2013-05-26 14:53:05 -07:00
Peter Cottle
7e165c6fdc zomg so many keys 2013-02-23 23:07:03 -08:00
Peter Cottle
a2e89f592d Allow for multiple spaces in git commands Issue #44 2013-02-20 19:36:17 -08:00
Peter Cottle
a954a659ce Rebuilding for Lukes pull 2013-02-18 07:41:30 -08:00
Luke Kysow
3732e4e98d Added common git aliases.
git ci => git commit,
git co => git checkout,
git st => git status,
git br => git branch
2013-02-17 22:05:06 -08:00
Peter Cottle
76b8a6cc9d better command counting 2013-01-03 17:47:30 -08:00
Peter Cottle
764fbf63bc able to open up views now from comand line 2013-01-02 11:57:16 -08:00
Peter Cottle
4aeb56c840 ok disbaled map is now just instants 2013-01-02 11:22:54 -08:00
Peter Cottle
4046916432 moving around 2013-01-02 11:14:46 -08:00
Peter Cottle
d497bea70c YAYYYyyy giatn refactor 2012-12-27 14:48:04 -08:00
Peter Cottle
a9d14521de moving command fucntionality 2012-12-27 13:42:43 -08:00
Peter Cottle
82d9e7a223 YAY looking a lot better, need to do rest of filter error 2012-12-25 18:27:50 -08:00