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

40 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
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
kazzna
8a3dd90e35 Refactor git switch tests 2023-09-19 13:43:58 +09:00
Jack Bird
eb5ef94cad Added test case 2023-07-23 20:15:58 +01:00
Jack Bird
df4215dd11 Added tests to cover delete functionality 2023-07-15 21:13:39 +01:00
Cesar Costas
e7fcf25566
Modify GitEngine and add test 2022-11-30 01:07:09 +00:00
Peter Cottle
cfd78346a7 Remove animation tests to fix build 2022-09-11 10:16:47 -06:00
Peter Cottle
ad04b2d8d8 Resolves #1004 -- fix arg parsing on git pull 2022-08-29 16:25:51 -06:00
Qusijue
ff28276c45 fix test 'rebase onto fast forward' 2021-08-13 21:05:49 +05:00
Qusijue
87684bbdc8 add some tests for rebase onto 2021-08-13 21:00:46 +05:00
Anh Hồng
b7ac2851c6 refactor: replace all master to main 2021-04-19 10:52:05 +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
6af2950e77 make all main references master under the hood 2020-12-27 10:10:30 -07:00
Peter Cottle
c765e476d5 Add test coverage for #734 2020-09-16 11:59:52 -07:00
Peter Cottle
6e8135a062 #701 -- allow ability to check for leftover branches in goal compare 2020-04-28 13:16:33 -07:00
Peter Cottle
21cc5e7382 Quick followups to PR #657 2020-03-29 15:57:55 -07:00
hongarc
17e4f195e5 chore(jasmine): fix test in travis-ci 
auto detect language
 2020-03-15 11:06:03 +07:00
hongarc
edfd052c4c chore: use gulp instead of grunt 2020-03-15 03:54:56 +07:00
Peter Cottle
496579b717 Test coverage for deleting tags, PR #599 2019-09-04 22:02:20 -07:00
David Nelson
44e7596381 Support range operator in revision range (log and rev-list) 2019-04-22 15:51:34 -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
Ｈｏｎｇａｒｃ
41bb6d1bd7 Fix more typo, ' and some word 2018-11-30 22:11:38 +07:00
Ｈｏｎｇａｒｃ
694f414e22 Fixed typos in comments and strings 2018-11-29 01:38:01 +07:00
Peter Cottle
0e61b0ce5f handle the ' too 2018-09-28 20:35:53 -05:00
Peter Cottle
e8d3bf8667 Resolves #483 case sensitivity 2018-09-28 20:30:06 -05: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
9a58c59705 one more test for #201 2016-09-25 13:51:23 -07:00
Peter Cottle
32c80bdb87 Resolves #201 -- allow dashes and slashes in branch names 2016-09-25 13:49:46 -07: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