Commit graph

14 commits

Author SHA1 Message Date
juanmv94
d45c7400b9 Test and level corrections after fetch/pull fixes 2024-04-27 18:13:32 +02:00
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
Jack Bird
df4215dd11 Added tests to cover delete functionality 2023-07-15 21:13:39 +01:00
Peter Cottle
ad04b2d8d8 Resolves #1004 -- fix arg parsing on git pull 2022-08-29 16:25:51 -06:00
Anh Hồng
b7ac2851c6 refactor: replace all master to main 2021-04-19 10:52:05 +07:00
Peter Cottle
6af2950e77 make all main references master under the hood 2020-12-27 10:10:30 -07:00
hongarc
edfd052c4c chore: use gulp instead of grunt 2020-03-15 03:54:56 +07:00
Hongarc
694f414e22 Fixed typos in comments and strings 2018-11-29 01:38:01 +07:00
Peter Cottle
8f3f32d82b Resolves #400 -- rebase --pull with just fast forward 2016-12-04 10:17:15 -08:00
Oleksandr Redko
5a784ae15e Fixed typos in comments and strings 2016-10-26 12:19:24 +03:00
Peter Cottle
1cd68c3ace another comma 2016-03-01 19:41:58 -08:00
Peter Cottle
46f6070253 comma whoops 2016-03-01 19:41:33 -08:00
Peter Cottle
a039693d63 test coverage 2016-02-29 09:31:10 -08:00
Roman
e068203893 Move tests to the root 2016-02-15 01:10:25 +05:00
Renamed from src/js/__tests__/remote.spec.js (Browse further)