Commit graph

2010 commits

Author SHA1 Message Date
juanmv94
d45c7400b9 Test and level corrections after fetch/pull fixes 2024-04-27 18:13:32 +02:00
juanmv94
5322fd6605 Fixed many fetch/pull issues on #1138 2024-04-26 02:41:44 +02:00
Romain Guerin
d09fc9e3c3 Resolves #1139: can use a direct permalink to a specific level 2024-04-24 10:09:37 +00:00
Peter Cottle
caf480d956 Resolves #1138 2024-04-22 07:32:06 -04:00
Peter Cottle
b86a9d704c Resolves #1134 -- show solution on gist levels 2024-03-30 18:18:42 -04:00
Peter Cottle
ac94520a99 Resolves #1128: edit the dialog a bit 2024-03-30 18:18:42 -04:00
DeadEmbed
de6f1bb9e4
Corrected typo in multipleParents.js 2024-02-25 22:30:56 +03:00
Peter Cottle
4f52fc5cb6 Resolves #1128: make it clear that side should be the name of the branch 2024-02-19 15:40:58 -05:00
Thierry Parlier
acc6555ded Added vitejs as a launcher for index.html. package.json 'prepare' command is used to create the index.html file to be used with vite 2024-02-06 12:16:17 +04:00
Cristóbal
1c18197ac2
Translate command-not-supported to es_AR, es_MX and es_ES
There is no error message for git-error-command-not-supported, a common error that occurs when typing any command incorrectly.
2024-01-11 18:50:53 -03:00
HumbertoMata
eee0720dc2 Translate the fakeTeamwork lesson to es_MX 2024-01-06 21:45:01 -06: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
Max Oliver
badfd715b9 Update pt_BR translations (replay of #1112) 2023-11-27 00:09:38 +00:00
Peter Cottle
7532b67b52
Merge pull request #1117 from maxoliverbr/main
Update strings.js
2023-11-21 21:17:35 -05:00
Peter Cottle
3dfcc2b27d Resolves #1115 clarify git branch f 2023-11-21 11:36:33 -05:00
Max Oliver
621d666e9b
Update strings.js
Some more PT-BR translations.
2023-11-20 01:20:18 -03:00
Peter Cottle
c3d0f1ca1f
Revert "pt_BR Translations fix and add." 2023-11-12 13:55:31 -05:00
Max Oliver
a88ef6066e
Update strings.js
Fixed typos in pt_BR
2023-11-12 00:04:22 -03:00
Max Oliver
6480d3e24a
Update strings.js
Fixed typo
2023-11-11 23:59:47 -03:00
Max Oliver
dc37508e19
Update strings.js
Fixed some translations and added some that were missing in pt_BR.
2023-11-11 23:41:06 -03:00
by_Lazarev
aab8ebcc5e
Update grabbingOneCommit.js
There are no branch `master`, it is `main`
2023-10-06 16:12:27 +03:00
Peter Cottle
05c98a48a4
Merge pull request #1106 from 0xK3rn3lP4n1c/turkishTranslations
Mixed Levels tranlated to Turkish
2023-10-05 14:27:10 -04:00
0xK3rn3lp4n1c
d01e9f1c6f tags level translated to Turkish 2023-10-05 17:23:36 +03:00
0xK3rn3lp4n1c
9a62b365e2 juggling commits 2 and tags translated to Turkish 2023-10-02 17:57:50 +03:00
0xK3rn3lp4n1c
fcbe27a538 juggling commits translated to Turkish 2023-09-28 14:33:16 +03:00
Peter Cottle
2da4d88737 remove some indenting from #1104 2023-09-21 09:16:48 -04:00
0xK3rn3lp4n1c
d8f1f28be0 turkish translation 2023-09-19 17:45:06 +03: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
K3rn3l_P4n1c
5736e878df merge conflict resolved 2023-09-15 19:47:24 +03:00
0xK3rn3lp4n1c
aae17f679a merge main into turkishTranslations & added new translations 2023-09-15 17:53:40 +03:00
0xK3rn3lp4n1c
9467f70e60 Levels merging & rebasing translated to Turkish 2023-09-14 17:24:22 +03:00
K3rn3l_P4n1c
1106081354 Branching and Commits translated to Turkish 2023-09-10 18:53:01 +03:00
Ömer Kaan Coşkun
35740665b4
New Turkish Translations added 2023-09-10 12:25:47 +03:00
K3rn3l_p4n1c
aa682638d1 New Turkish Translations added 2023-09-01 19:21:29 +03:00
K3rn3l_p4n1c
7a65713101 added Turkish translations 2023-09-01 18:31:56 +03:00
Alessandro
d69fbb9a7c
Deleted repetition of the word "aver" in the Italian translation
Deleted repetition of the word "aver" in the Italian translation.

I take this opportunity to thank you immensely for the work you have done which is helping me to better understand how github works in my study path.
Sorry if I made some mistakes but English is not my native language and I'm using google translate to write, thanks again for the work you have done and I wish you all the best in your future and future projects.
2023-08-31 15:23:10 +02:00
Jack Bird
3ad9264557 fixed rebase not rebasing in the order of commits in the tree 2023-07-23 20:15:45 +01:00
Martin Casillas
5dc784ac4b Added es_MX to levels/rebase/selectiveRebase.js 2023-07-21 20:51:07 +00:00
Martin Casillas
9b37190220 Added es_MX to levels/rebase/manyRebases & typo 2023-07-21 19:38:30 +00:00
Martin Casillas
d2129174d0 Added es_MX to levels/mixed/describe.js 2023-07-21 19:15:51 +00:00
Martin Casillas
a089062eba Added es_MX to levels/remote/fetch.js 2023-07-21 18:37:57 +00:00
Martin Casillas
d8486c3b26 Added es_MX to levels/remote/remoteBranches.js 2023-07-21 18:00:45 +00:00
Martin Casillas
bed8b6d9cc Added es_MX to levels/remote/pullArgs.js 2023-07-21 17:18:32 +00:00
Martin Casillas
f96027cf3d Added es_MX to levels/remote/clone.js 2023-07-19 23:59:45 +00:00
Jack Bird
6258ed501e updated undo command to only track when a command changes the tree 2023-07-18 19:19:56 +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
Sylvain Glaize
9754a986d0
Update a french message to make it more natural
The proposed current sentence is a direct translation of the English sentence. Understandable if you know English, but not natural French.
2023-07-07 21:02:55 +02:00