Commit graph

2554 commits

Author SHA1 Message Date
Peter Cottle
e372e5dddf Double space removal, PR #881 2021-08-24 10:18:08 -06:00
Peter Cottle
9d885eedbb
Merge pull request #881 from dbarani/fix_italian_wrong_wording_branches_reversingChanges
Fix italian wording of branch type in reversing changes lesson
2021-08-24 10:17:25 -06:00
Daniele
92e6bfa4f5 Fix italian wording of branch type in reversing changes lesson
Fix wrong wording on branch type in reversing changes lesson, italian version
2021-08-24 09:23:37 +02:00
Peter Cottle
60778913e3
Merge pull request #880 from dbarani/fix_italian_master_branch_wording
Fix typo in italian intro dialog version
2021-08-23 08:54:05 -06:00
Daniele
a9fbd2adbd Fix typo in italian intro dialog version
Fixes the old default branch 'master' deleting the repetition of the branch 'main' which substitutes it
2021-08-23 15:45:25 +02:00
Peter Cottle
6e7f4edbce
Merge pull request #876 from Qusijue/imported-lvl-goal
show goal for imported levels
2021-08-14 10:02:59 -06:00
Qusijue
27e54816f7 show goal for imported levels 2021-08-13 22:05:58 +05:00
Peter Cottle
f3b09aa009
Merge pull request #875 from Qusijue/rebase-onto
rebase onto implemented
2021-08-13 10:25:09 -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
Qusijue
521cc0e809 rebase onto implemented 2021-08-13 19:11:00 +05:00
Peter Cottle
d46ad204a0
Merge pull request #873 from Qusijue/spelling-patch
Minor formatting/typo fix
2021-08-12 09:30:08 -06:00
Qusijue
ffe07fd193 Minor formatting/typo fix 2021-08-12 20:24:23 +05:00
Peter Cottle
592399b1db
Merge pull request #871 from YourSenseiCreeper/master
Polish translation to push and fetchRebase chapters
2021-08-08 11:46:24 -06:00
YourSenseiCreeper
763b925a76 Fetch rebase pl translation 2021-08-08 19:05:10 +02:00
YourSenseiCreeper
693bb4263c Push pl translation 2021-08-08 18:21:58 +02:00
Peter Cottle
938e629f00
Merge pull request #870 from SPGoding/disable-switch
Disable 'git switch' along with 'git checkout'
2021-08-06 14:09:19 -06:00
SPGoding
442d693a0a
Disable 'git switch' along with 'git checkout' 2021-08-06 14:35:50 -05:00
Peter Cottle
6a34664a6c
Merge pull request #868 from nwettstein/patch-1
Minor formatting fix in the french version of remoteAdvanced3
2021-08-02 08:44:32 -06:00
Nicolas Wettstein
179d5ff309
Minor formatting fix in the french version of the remoteAdvanced3 lesson. 2021-08-02 18:03:57 +10:00
Peter Cottle
a57c85e94b
Merge pull request #866 from monguz-it/patch-1
Fixed italian typo
2021-07-30 08:38:46 -06:00
monguz
8328c4cd89
Fixed italian typo 2021-07-30 09:24:38 +02:00
Peter Cottle
afb7f5cb9e
Merge pull request #865 from SubaruArai/main
localization fix: Japanese
2021-07-28 13:38:58 -06:00
Subaru Arai
93ed0be64a localization fix: Japanese 2021-07-28 16:17:53 +09:00
Subaru Arai
e069a5d435 localization fix: Japanese
The localization of rampup 4 "## Git Revert" was not understandable.
2021-07-28 09:49:23 +09:00
Peter Cottle
bc9aaac2f6
Merge pull request #864 from vinothmdev/master
Tracking step tamil translation
2021-07-27 08:28:53 -06:00
vinothmdev
a15c769bc4 Finished Tracking step translation 2021-07-27 03:46:06 +00:00
Peter Cottle
a7867c2340
Merge pull request #863 from amelielecoz/fixTypoInDescribeInstructions
Fix typo in exercise instructions for Mixed - level 5
2021-07-26 08:50:23 -06:00
Amélie Le Coz
0ba94916d6 Fix typo 2021-07-26 16:45:13 +02:00
Peter Cottle
09bd8ed8b6
Merge pull request #862 from amelielecoz/fixFrenchTextMixedLevel4
Fix a typo in Mixed Level 4
2021-07-26 08:36:09 -06:00
Amélie Le Coz
2885779636 Fix typo 2021-07-26 16:30:49 +02:00
Peter Cottle
08a6f0ee59
Merge pull request #861 from peppelauro/patch-1
Update merging.js
2021-07-19 08:31:49 -07:00
Peter Cottle
4f0bd985a9
Merge pull request #860 from mandudu123/main
Add bottom menu "zh_TW" translation
2021-07-19 08:28:56 -07:00
peppelauro
55aab5778c
Update merging.js 2021-07-19 11:49:04 +02:00
Chris Chou
a5192c68b7 Add bottom menu "zh_TW" translation 2021-07-17 22:52:35 +08:00
Peter Cottle
5249411ce1
Merge pull request #857 from blentz100/clarifyWording
changed "reverts" to "reverses" for readability and consistency
2021-07-16 09:29:18 -06:00
Brendan Lentz
ff14474691 changed reverts to reverses for better readability and consistency with the reset of the section 2021-07-15 21:37:05 -07:00
Peter Cottle
318fd580e6
Merge pull request #852 from YourSenseiCreeper/master
Polish translation to pull and fakeTeamwork
2021-06-21 08:26:56 -06:00
YourSenseiCreeper
e6cbfb0968 Polish translation to pull and fakeTeamwork 2021-06-21 08:22:38 +02:00
Peter Cottle
7ae38df1fa
Merge pull request #850 from CasheeeewNuts/translate-japanese
Translate several contents into Japanese
2021-06-17 07:35:50 -06:00
Shu-Nonaka
f3aeba64dc translate pullArgs.js into japanese 2021-06-17 14:41:52 +09:00
CasheeeewNuts
4a4f1b6f7d translate remote/sourceNothing.js into japanese 2021-06-17 00:14:10 +09:00
CasheeeewNuts
2abf4f0783 translate remote/fetchArgs.js into japanese 2021-06-16 00:10:45 +09:00
CasheeeewNuts
223c820566 translate remote/pushArg2.js into japanese 2021-06-15 23:04:24 +09:00
Peter Cottle
2be71c2254 Resolves #849 -- contrast on HEAD 2021-06-13 17:11:29 -06:00
Peter Cottle
ee25808e0f
Merge pull request #848 from pcottle/issue845
Issue #845 -- show options for each command: Resolves #845
2021-06-11 09:32:48 -06:00
Peter Cottle
3663e24975 Issue #845 -- show options for each command 2021-06-10 08:48:10 -06:00
Peter Cottle
4be8450a20
Merge pull request #847 from pcottle/dependabot/npm_and_yarn/normalize-url-4.5.1
Bump normalize-url from 4.5.0 to 4.5.1
2021-06-09 08:38:23 -06:00
dependabot[bot]
58bf23e194
Bump normalize-url from 4.5.0 to 4.5.1
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-09 14:31:27 +00:00
Peter Cottle
684a2b9ca8
Merge pull request #846 from linooohon/add-translation-zhtw
fix: add zh_TW translation
2021-06-06 08:20:22 -06:00