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

2554 commits

This branch
This branch
All branches
Author SHA1 Message Date
yzhang
b3a59b8c95 follow-up 2020-08-11 07:59:43 +08: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
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
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
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
a1f7bda2d9 Closes #718 -- clarify the two options we can do in our interactive rebase 2020-07-05 14:21:32 -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
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
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
677b93d9b9
Merge pull request #710 from Fietel/typosGermanTranslation 
Improvements of the german translation
 2020-06-05 12:47:57 -07:00
heyson
d629e73f44 fixed typos and improved the readability of some sentences 2020-06-04 13:35:06 +02:00
Peter Cottle
61e19da784
Merge pull request #709 from BillLucky/patch-1 
fix(doc): typo
 2020-05-16 07:29:25 -07:00
Bill
b56ae1e555
fix:typo 
异或 -> 亦或
 2020-05-16 21:03:29 +08:00
Peter Cottle
c093aaa636
Merge pull request #708 from hong4rc/marked 
Using `marked` instead of `markdown`
 2020-05-14 09:14:56 -07:00
Anh Hong
d01271e654 Using marked instead of markdown 2020-05-13 13:18:31 +07:00
Peter Cottle
38a04bdae5
Merge pull request #707 from nem75/improvement/add-missing-periods 
#705 Add missing period characters
 2020-05-12 09:58:39 -07:00
Jens Bremmekamp
7d5e83610a #705 Add missing period characters 2020-05-12 10:48:07 +02:00
Peter Cottle
3d2d3dac42
Merge pull request #704 from amayer5125/github 
Capitalize the "H" in GitHub
 2020-05-05 13:54:49 -07:00
Alex Mayer
7075b67e1a Capitalize the "H" in GitHub 
Match the way it appears on the official website
 2020-05-05 14:37:02 -04:00
Peter Cottle
781a1a5dd7
Merge pull request #703 from amayer5125/commit-amend 
Add git to Begining of Code Example
 2020-05-04 13:41:22 -07:00
Alex Mayer
5259aed2b7 Add git to Begining of Code Example 
Reduce confusion if "commit" is a command or a sub-command of git.
 2020-05-04 16:03:30 -04:00
Peter Cottle
8cf8faa5fe
Merge pull request #702 from Selogaz/desc-grammar-682 
grammar bug fixed at 682
 2020-05-02 13:55:53 -07:00
Iskander
20d603e376 grammar bug fixed 2020-05-02 14:03:25 +07:00
Peter Cottle
8a51749e71 Resolves #701 -- enforce branch cleanup on one level 2020-04-29 17:59:41 -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
6e9ede0023
Merge pull request #700 from pcottle/removeOneDep 
Remove jquery sortable ui npm dep
 2020-04-27 19:50:13 -07:00
Peter Cottle
cd1ff64f14 Remove jquery sortable ui 2020-04-27 19:48:35 -07:00
Peter Cottle
76a61ec0ae Closes #696 -- remove FB pixels 2020-04-27 19:45:10 -07:00
Peter Cottle
232dbb46a6
Merge pull request #699 from pcottle/changeCompareLogic 
Iterate on #698 to solve #697
 2020-04-27 19:41:14 -07:00
Peter Cottle
d5ba50c97d Iterate on #698 to solve #697 2020-04-27 19:32:03 -07:00
Peter Cottle
270167189f
Merge pull request #692 from 0xflotus/patch-1 
(ger): updated grammar in some translations
 2020-04-25 11:58:34 -07:00
Peter Cottle
c579bbbb23
Merge pull request #693 from matictrebusak/translation-slovenian 
Slovenian translations
 2020-04-25 11:58:11 -07:00
Peter Cottle
1be837d10c
Merge pull request #690 from hong4rc/patch-2 
Add `draggable` of `jquery-ui`
 2020-04-25 11:51:45 -07:00
matictrebusak
58714a3d29
Merge branch 'master' into translation-slovenian 2020-04-24 18:07:35 +02:00
MrMcKracken
7e9520664b Fixed typo in german translation 
(_ohne_ ihne vorher ...)  --> (_ohne_ ihn vorher ...)
 2020-04-24 17:18:30 +02:00
CuFa
a3ab4065b3 es_AR translation & es_ES corrections 2020-04-24 17:18:30 +02:00