Peter Cottle
7fc33541cc
[FeatureRequest] git push --force beta Resolves #185
2014-11-29 17:34:37 -08:00
Patrick
00cc6349d0
Added extra flag to interactive rebase which accepts a list of commits (ordering counts). This list will then be shown to the user when the rebase dialog shows up when showing a solution that does an interactive rebase. This is so the user doesn't have to guess about what commits were picked and how they were ordered for the solution
2014-07-26 15:22:26 -04:00
Peter Cottle
2423646199
PR #195 bit of style cleanup and error handling and test for error handling
2014-07-26 21:40:45 +08:00
Patrick
72cc7d6bd3
Added testable interactive rebase. It doesn't fully test everything (mainly the GUI), but is a start
2014-07-24 17:43:59 -04:00
Patrick Tully
55ac6da589
Changed checkout -B to set the branch to point at the specified commit rather than always using HEAD
2014-07-20 12:36:37 -04:00
Patrick Tully
dd58afde76
Changed interactive rebase to rebase the target branch if specified
2014-07-20 12:36:27 -04:00
Peter Cottle
f952bd7061
Resolves #154 input escaping issue when accessing remote branch locally to push remote, fixed others too
2014-01-06 10:04:03 -08:00
Peter Cottle
17fda94aff
Better helper bar with float and more room for options
2013-12-30 10:23:58 -08:00
Peter Cottle
e7d9b76b98
moved another function to graph
2013-12-23 10:15:16 -08:00
Peter Cottle
fcd0ffce85
Resolves Issue #151 silly assert issue
2013-12-15 17:23:51 -08:00
Peter Cottle
598f8263b3
whitespace warnings
2013-12-08 10:37:10 -08:00
Peter Cottle
1ba46f7705
yay command option parsing makes more sense
2013-11-18 10:22:53 -08:00
Peter Cottle
c3f0f48f28
Issue #144 describe support for command
2013-11-04 18:39:51 -08:00
Peter Cottle
ebfd5e84d2
Merge branch 'tagSupport' Pull Request #137 Issue #134
...
Conflicts:
src/js/git/index.js
2013-10-27 12:37:48 -07:00
Peter Cottle
dc8df68dac
push args done
2013-10-26 14:14:08 -07:00
Peter Cottle
55d563a9bc
gah was forgetting origin assert
2013-10-26 13:44:52 -07:00
Peter Cottle
9760874f69
sweet new fetch levle
2013-10-26 13:21:44 -07:00
Peter Cottle
c522722513
much better interaction on levels keys with tabs
2013-10-26 12:46:19 -07:00
Peter Cottle
749a303904
more pull work
2013-10-22 11:00:33 -07:00
Peter Cottle
b8cf7f75c0
yay all tests pass and big git pull update
2013-10-22 10:56:35 -07:00
Peter Cottle
99bf9bacd3
big progress on fetch
2013-10-22 09:42:18 -07:00
Peter Cottle
c7ba5c3afe
destination args primed
2013-10-21 19:46:16 -07:00
Peter Cottle
3da3df9cf3
sweet new branch command option, removed one level, new level on remote tracking, etc
2013-10-20 20:12:02 -07:00
Peter Cottle
f11f76bbe8
BOOM all tests pass, more progress on git fetch
2013-10-17 19:49:17 -07:00
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
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
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