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

2261 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
bf653813ea rebuild for prod 2020-08-21 13:11:28 -06:00
Peter Cottle
c77b849609 merge master 2020-08-21 13:11:12 -06:00
Peter Cottle
37c72805cc Resolves #728 2020-08-21 11:27:12 -06:00
Peter Cottle
3ec829596d
Merge pull request #730 from f6fvy/patch-1 
Typo in French translation
 2020-08-21 11:23:16 -06:00
Laurent Haas - F6FVY
bb01f4d1dd
Typo in French translation 2020-08-21 15:55:15 +02:00
Peter Cottle
35f799adae rebuild for prod 2020-08-10 18:07:56 -06:00
Peter Cottle
d7a0437f5b merge master 2020-08-10 18:07:43 -06:00
Peter Cottle
757a86e6e6
Merge pull request #727 from yzhang-gh/master 
#726 follow-up
 2020-08-10 18:07:32 -06:00
yzhang
b3a59b8c95 follow-up 2020-08-11 07:59:43 +08:00
Peter Cottle
73c34e425f rebuild for prod 2020-08-10 12:28:44 -06:00
Peter Cottle
f95226c463 merge master 2020-08-10 12:28:32 -06:00
Peter Cottle
3c2dcf88f1
Merge pull request #726 from yzhang-gh/master 
💄 Choose proper fonts for all 3 OSes
 2020-08-10 12:27:58 -06:00
yzhang
188bda5964 💄 choose proper fonts for all 3 OSes 2020-08-10 11:18:28 +08:00
Peter Cottle
7ed6ad9d76
Merge pull request #725 from pcottle/dependabot/npm_and_yarn/elliptic-6.5.3 
Bump elliptic from 6.5.2 to 6.5.3
 2020-07-30 09:55:47 -06:00
dependabot[bot]
54b1f546e5
Bump elliptic from 6.5.2 to 6.5.3 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-30 12:44:58 +00:00
Peter Cottle
6021167090
Merge pull request #723 from pcottle/dependabot/npm_and_yarn/lodash-4.17.19 
Bump lodash from 4.17.15 to 4.17.19
 2020-07-16 13:27:58 -07:00
dependabot[bot]
e689ffde8b
Bump lodash from 4.17.15 to 4.17.19 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-16 19:31:23 +00:00
Peter Cottle
809a03ac8d rebuild for prod 2020-07-11 19:52:44 -07:00
Peter Cottle
a6ce8f9241 merge master 2020-07-11 19:52:32 -07:00
Peter Cottle
37989eeb4f
Merge pull request #721 from rafaelfernandesti/master 
Adding support to Portuguese - remote8 - lockedMaster
 2020-07-11 19:51:58 -07:00
Prof Rafael
e5e98a4bf9 Adding support to Portuguese - remote8 - lockedMaster 2020-07-10 20:30:16 -03:00
Peter Cottle
283022426e rebuild for prod 2020-07-09 15:25:01 -07:00
Peter Cottle
900cd5d44c merge master 2020-07-09 15:24:49 -07:00
Peter Cottle
aaa6f8e61d
Merge pull request #720 from wuzh07/master 
Fix one incomplete translation
 2020-07-09 15:24:34 -07:00
wuzh07
aeb40d591c
Fix one incomplete translation 
"在上一了我们已经提及过这一点了" -> "在上一节课程中我们已经提及过这一点了"
 2020-07-09 11:27:11 +08:00
Peter Cottle
16de32d964 rebuild for prod 2020-07-05 15:02:28 -07:00
Peter Cottle
375563d2c8 merge master 2020-07-05 15:02:16 -07:00
Peter Cottle
2a9733ff22
Merge pull request #719 from pcottle/addAliasSupport 
Resolves #593 -- add alias support with local storage
 2020-07-05 15:01:29 -07:00
Peter Cottle
12cdb49457 Resolves #593 -- add alias support with local storage 2020-07-05 14:57:21 -07:00
Peter Cottle
8c1ded679d rebuild for prod 2020-07-05 14:21:59 -07:00
Peter Cottle
f34c1726d4 merge master 2020-07-05 14:21:47 -07:00
Peter Cottle
a1f7bda2d9 Closes #718 -- clarify the two options we can do in our interactive rebase 2020-07-05 14:21:32 -07:00
Peter Cottle
6098201bf6 rebuild for prod 2020-06-30 14:51:23 -07:00
Peter Cottle
79545dee92 merge master 2020-06-30 14:51:12 -07:00
Peter Cottle
1d46d36a52
Merge pull request #717 from whyalwaysmeyy/fixKorTypo 
Improvements of Korean translation
 2020-06-30 14:47:23 -07:00
MozyLee
44995934e5 Fix typos, word spacing 2020-07-01 04:23:58 +09:00
MozyLee
7f7217ae07 Fix word spacing and sentences 2020-07-01 04:17:32 +09:00
MozyLee
c58cfb51bb fix typos, word spacing 2020-07-01 03:17:11 +09:00
MozyLee
0eee086db7 fix Korean Typo 2020-07-01 02:18:37 +09:00
Peter Cottle
eceb412bd3 rebuild for prod 2020-06-19 09:27:20 -06:00
Peter Cottle
289a65a5c5 merge master 2020-06-19 09:27:09 -06:00
Peter Cottle
faba214773
Merge pull request #715 from gmounie/master 
Bug: reverse meaning in French
 2020-06-19 09:26:44 -06:00
Grégory Mounié
4cbe6d3da2 Bug: reverse meaning in French 
bugFix is the parent of master, not its child. master is "descendant"
of bugFix, not the reverse.
I use "ancêtre", as other latin langage translaton, instead.
"parent" exists in French but is ambiguous, and have broader
and narrower contextual meanings (respectively, any relative, eg. cousins,
or just father and mother).
 2020-06-19 12:23:38 +02:00
Peter Cottle
72c1c1de90 rebuild for prod 2020-06-10 18:17:48 -06:00
Peter Cottle
0ef47ee962 merge master 2020-06-10 18:17:36 -06:00
Peter Cottle
8924ca4426
Merge pull request #711 from Rafer45/master 
Fix typo
 2020-06-10 18:17:13 -06:00
Rafer45
9352e3a0e2
Fix typo 2020-06-10 18:45:27 -04:00
Peter Cottle
4bf3666414 rebuild for prod 2020-06-05 13:48:25 -06:00
Peter Cottle
8f3afee740 merge master 2020-06-05 13:48:13 -06:00
Peter Cottle
677b93d9b9
Merge pull request #710 from Fietel/typosGermanTranslation 
Improvements of the german translation
 2020-06-05 12:47:57 -07:00