Lucie Lenglet
acffcc1616
feat: command to simulate Merge/Pull Request
...
- Adds `git merge(M|P)R <source_branch> <target_branch> [--delete-after-merge]` command
to simulate a Merge/Pull Request being merged into the target branch
- The optional flag `--delete-after-merge` will remove the merged branch on the origin tree
- The local remote branch remains as it is Git default behavior, even after `git fetch`
(it would require `git fetch --prune` support to automatically prune remote tracking branches)
- You can push a branch with a deleted remote tracking branch on origin, the ref will just update.
Resolves #1057
2023-12-15 19:32:47 +01:00
Peter Cottle
2da4d88737
remove some indenting from #1104
2023-09-21 09:16:48 -04:00
kazzna
199f0219c4
Add git switch --force-create
2023-09-19 13:45:53 +09:00
kazzna
86bf7c7a71
Add git switch -C
2023-09-19 13:45:26 +09:00
kazzna
2edc86e9a0
Add git switch --create
2023-09-19 13:45:02 +09:00
Jack Bird
3ad9264557
fixed rebase not rebasing in the order of commits in the tree
2023-07-23 20:15:45 +01:00
Jack Bird
d50d910c9b
removed import added by accident
2023-07-15 21:20:15 +01:00
Jack Bird
229415444e
Added -d and --delete to git push to delete remote branches
2023-07-15 20:56:07 +01:00
Cesar Costas
30a50cf4c0
Manually add arguments after squash to the general arguments
2022-11-30 02:35:44 +00:00
Cesar Costas
e7fcf25566
Modify GitEngine and add test
2022-11-30 01:07:09 +00:00
Cesar Costas
4471fc9595
Update commands.js
...
Being a popular option in Github to squash and merge, it would be interesting to add support for this option
2022-11-29 23:01:57 +00:00
Peter Cottle
ad04b2d8d8
Resolves #1004 -- fix arg parsing on git pull
2022-08-29 16:25:51 -06:00
Peter Cottle
a28879d72b
Fix tags for #963
2022-05-01 12:58:29 -06:00
0xLogN
1e1c3a46e6
add git gc command
2022-04-29 18:34:11 -07:00
Qusijue
521cc0e809
rebase onto implemented
2021-08-13 19:11:00 +05:00
Anh Hồng
b7ac2851c6
refactor: replace all master to main
2021-04-19 10:52:05 +07:00
Peter Cottle
8249f01651
Resolves #818
2021-03-23 08:10:10 -06:00
sam king
8057d2a5da
switching use of master to main in git branch cmd
2021-03-04 08:48:58 -08:00
Peter Cottle
9cadfa1eee
Resolves #801
2021-02-21 10:29:21 -07:00
Peter Cottle
ddb3dc93ca
Resolves #778
2021-01-11 12:30:35 -07:00
Peter Cottle
a08fa94e92
Resolves #769 -- updates solution commands and fixes a TON more bugs with the master to main renaming
2021-01-01 14:20:05 -07:00
Peter Cottle
8a159ea498
Resolves #768 -- fix pull arguments (same issue)
2020-12-30 09:20:03 -07:00
Peter Cottle
a530dcbb16
Resolves #766 -- resolve ID on push function as well
2020-12-30 08:32:58 -07:00
Peter Cottle
2793a1d6a1
rm debugger
2020-12-29 08:54:29 -07:00
Peter Cottle
7be578699d
Resolves #766 -- use same method post command validation so o/main works
2020-12-29 08:52:42 -07:00
Peter Cottle
6af2950e77
make all main references master under the hood
2020-12-27 10:10:30 -07:00
ignite1771
42b3235a5d
Fix multiple paragraph tags of 'log' and 'show'
...
Replace '\n' with '<br/> so as to get rid of <p> tags
with every line, and avoid to directly write the
template in the function.
2020-12-25 20:54:12 +08:00
Ulysse ARNAUD
11448ed428
Added git switch with '-' and '-c' as optional arguments
2020-09-16 20:35:07 +02:00
Peter Cottle
278004f957
Issue #660 -- fix non-deterministic ordering of commits
2020-03-29 17:05:57 -07:00
hongarc
edfd052c4c
chore: use gulp instead of grunt
2020-03-15 03:54:56 +07:00
Samuel H Leclerc
512264119d
Fixed typo in error message displayed
2019-09-15 15:27:38 +00:00
Lukas Schmid
b281d1d76c
Added support for git tag -d <tag> and fixed a bug where a duplicate tag name wouldn't show in the error-msg
2019-09-04 16:47:24 +02:00
David Nelson
44e7596381
Support range operator in revision range (log and rev-list)
2019-04-22 15:51:34 -05:00
David Nelson
9b4b6627b6
Convert revision range processing to pipeline model
2019-04-22 15:12:00 -05:00
Peter Cottle
06e0f29acf
Merge pull request #565 from eatdrinksleepcode/revision-range
...
More robust support for revision ranges
2019-04-21 12:57:44 -07:00
David Nelson
b9f8e19162
Implement log using RevisionRange
...
This changes the implementation of the "log" command to use the RevisionRange
functionality. RevisionRange sorts the results in order of reverse create time,
to match real git. This is a change from the previous implementation of log,
which essentially produced a breadth-first ordering.
2019-04-19 01:58:53 -05:00
David Nelson
8529a3aac7
Implement rev-list
...
This commit introduces the RevisionRange, which more closely follows real git
in terms of identifying a range of revisions than the current implementation of
log. RevisionRange is being used in the new rev-list command first because it
is easy to test for ordering. A future commit will replace the existing
implementation of log with RevisionRange.
2019-04-19 01:58:34 -05:00
David Nelson
6e5d6a64e9
Add tests for currently supported log arguments
2019-04-19 01:57:58 -05:00
David Nelson
d4a2fbb2de
Explicitly fail when unsupported range operator is specified
2019-04-18 14:54:18 -05:00
Ｈｏｎｇａｒｃ
27ef578b2e
Remove 16 underscore requires
2018-12-01 13:04:24 +07:00
Ｈｏｎｇａｒｃ
96ddb5041a
Use 'Object.values' and 'Object.keys' instead of '_.each(object)'
2018-12-01 12:34:23 +07:00
Ｈｏｎｇａｒｃ
bd8009386d
Use 'Array.prototype.forEach' instead of '_.each' and '_.forEach'
2018-12-01 11:28:04 +07:00
Ｈｏｎｇａｒｃ
d87fd095c0
Use 'Object.values' and 'Object.keys' to get list 'keys' and 'values'
2018-12-01 08:51:03 +07:00
Ｈｏｎｇａｒｃ
e17d974b55
Use 'util/escapeString' instead of _.escape
2018-12-01 08:40:56 +07:00
Ｈｏｎｇａｒｃ
dddf063146
Replace '_.filter' to 'Array.prototype.filter'
2018-12-01 08:27:01 +07:00
Ｈｏｎｇａｒｃ
7af2db3da5
Replace '_.map' to 'Array.prototype.map'
2018-12-01 08:20:42 +07:00
Ｈｏｎｇａｒｃ
0134bf9870
Replace some '_.each' with 'Array.prototype.forEach'
2018-12-01 08:05:27 +07:00
Ｈｏｎｇａｒｃ
489a4b9095
change '_.clone(..args)' to 'Object.assign({}, ..args)'
2018-12-01 06:37:25 +07:00
Ｈｏｎｇａｒｃ
052aa1e299
change '_.extend' to 'Object.assign'
2018-12-01 06:07:06 +07:00
Ｈｏｎｇａｒｃ
41bb6d1bd7
Fix more typo, ' and some word
2018-11-30 22:11:38 +07:00
