mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 01:10:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2182 commits 8 branches 0 tags 104 MiB
Commit graph

2182 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
15486d8132
Merge pull request #615 from cyper85/master 
German Language Issues
 2019-10-16 09:40:22 -07:00
Andreas Neumann (e007186)
bd98c4a6b2 increase readability of german text 2019-10-16 18:35:57 +02:00
Andreas Neumann (e007186)
8fdcdb5444 german text corrected 2019-10-16 18:30:36 +02:00
Peter Cottle
8ef76ad0ab
Merge pull request #611 from PhilipEnchin/fix-push-level 
Disable "git fakeTeamwork" in push level (remote6)
 2019-10-07 11:47:38 -07:00
Peter Cottle
d22a84fd8e
Merge pull request #612 from PhilipEnchin/fix-source-nothing-level 
Disable "git branch" and "git checkout" in source nothing level (remoteAdvanced7)
 2019-10-07 11:45:34 -07:00
Philip Enchin
2f938ffd50 Disable "git branch" and "git checkout" in source nothing level (remoteAdvanced7) 2019-10-03 14:28:30 -04:00
Philip Enchin
ca846c9d0c Disable "git fakeTeamwork" in push level (remote6) 2019-10-03 12:47:56 -04:00
Peter Cottle
fde456d369
Merge pull request #610 from Hongarc/fix/command 
fix: get `ls` and `cd` with right way
 2019-10-01 12:49:15 -07:00
Hongarc
be3dd21a32
Merge branch 'master' into fix/command 2019-09-25 10:46:46 +07:00
hongarc
d8ea1dbb5c fix: get ls and cd with right way 2019-09-25 10:31:57 +07:00
Peter Cottle
fa5638f3b8 Resolves #608 -- enforce word boundary 2019-09-25 10:40:57 +08:00
Peter Cottle
2784f9b7f3
Merge pull request #605 from Zabari/patch-1 
Update index.js
 2019-09-22 02:59:29 -07:00
Peter Cottle
08879c1966
Merge pull request #606 from Hongarc/update-contributor 
Update contributors
 2019-09-22 02:57:24 -07:00
hongarc
f245c97a1b Update contributor 
- top 30 contributor
 2019-09-22 09:19:15 +07:00
Daniel Zabari
25bc2350d2
Update index.js 
made it clear that this is not a typo :P
 2019-09-20 17:30:09 -04:00
Daniel Zabari
ec1690fdcd
Update index.js 
this is a HUGE missed opportunity for a pun, and I think the pun fits better with the tone of the site generally
 2019-09-19 14:10:35 -04:00
Peter Cottle
1059ba5fa2
Merge pull request #602 from mexanga/commandTimeout 
Change upper value in 'git-error-args-few' string to lower
 2019-09-16 16:38:17 -07:00
unknown
9e4e79323a Change upper value in 'git-error-args-few' string to lower 2019-09-16 21:35:18 +02:00
Peter Cottle
c47b927e23
Merge pull request #600 from Retucex/master 
Fixed typo in error message displayed
 2019-09-16 07:36:55 -07:00
Samuel H Leclerc
512264119d Fixed typo in error message displayed 2019-09-15 15:27:38 +00:00
Peter Cottle
8dbc56c42a remove random file 2019-09-12 10:17:30 -07:00
Peter Cottle
496579b717 Test coverage for deleting tags, PR #599 2019-09-04 22:02:20 -07:00
Peter Cottle
fc456eecc1
Merge pull request #599 from LukasSchmid97/deleteTags 
added git tag -d <tag> and  fixed error message
 2019-09-04 21:59:40 -07:00
Lukas Schmid
b281d1d76c Added support for git tag -d <tag> and fixed a bug where a duplicate tag name wouldn't show in the error-msg 2019-09-04 16:47:24 +02:00
Peter Cottle
251ec17ed9
Merge pull request #597 from wuzh07/fixTypo-from-wuzh07 
fixed a typo of fetchRebase.js
 2019-08-27 08:50:36 -07:00
wuzh07
b25095c2f6
fixed a typo of fetchRebase.js 
"工们"->"我们"
 2019-08-27 21:53:02 +08:00
Peter Cottle
611d0a1661
Merge pull request #588 from hisbvdis/ru_translate_corrections#2 
Small mistake in previous commit
 2019-06-11 12:22:50 -07:00
hisbvdis
89ebecf5ce Small mistake in previous commit 2019-06-11 22:03:15 +03:00
Peter Cottle
85c5a1c602
Merge pull request #587 from hisbvdis/ru_translate_corrections 
rampup relativeRefs translate corrections
 2019-06-11 08:54:16 -07:00
hisbvdis
d06fa0185d rampup relativeRefs translate corrections 2019-06-11 10:06:35 +03:00
Peter Cottle
a8e6ef1e45
Merge pull request #586 from luciancic/favicon 
add favicon
 2019-06-10 08:19:55 -07:00
Lucian Condrea
6e39a45adf
add link with icon in head 2019-06-09 11:55:08 +02:00
Lucian Condrea
95e4aac541
add favicon 2019-06-09 11:51:42 +02:00
Peter Cottle
a7f431399d
Merge pull request #584 from DevIntent/enableEsEs 
feat: make es_ES available from the languages menu
 2019-06-06 11:43:55 -07:00
Michael Prentice
e69c566835
feat: make es_ES available from the languages menu 
rename es_AR to argentino
 but leave it as the default for Spanish
 since es_ES is not fully translated

Fixes #528
 2019-06-05 18:54:20 -04:00
Peter Cottle
a506d3d907 Resolves #583 -- fix function binding 2019-06-05 15:19:21 -07:00
Peter Cottle
42e2b2429a
Merge pull request #582 from kimsey0/patch-1 
Set line height of icons bar icons
 2019-05-16 19:51:31 -07:00
Jacob Bundgaard
6179ccdb38
Set line height of icons bar icons 
Fixes #581.
 2019-05-16 16:13:09 +02:00
Peter Cottle
724a341a61
Merge pull request #580 from jankeromnes/patch-1 
Use `yarn grunt` instead of the global `grunt`
 2019-05-09 12:34:39 -07:00
Jan Keromnes
e879213d3b Prefix grunt with yarn in README.md as well 2019-05-09 07:47:12 +00:00
Jan Keromnes
03d8415f96 Make Gitpod use yarn grunt instead of the global grunt 2019-05-09 07:24:20 +00:00
Peter Cottle
02a8e0f214
Merge pull request #579 from Hongarc/react 
Use `babelify` instead of `grunt-react`
 2019-05-02 13:30:44 -07:00
Hongarc
14f3fde623 Remove @babel/preset-env 2019-05-02 12:55:09 +07:00
Hongarc
ec0ca6b711 Use babelify instead of grunt-react 2019-05-02 12:44:56 +07:00
Peter Cottle
5891d44796
Merge pull request #577 from eatdrinksleepcode/verify-no-changes 
Check that there are no source file changes before building
 2019-05-01 11:43:25 -07:00
David Nelson
4e32f729c1 Check that there are no source file changes before building 
If dependencies are changed (in package.json) without updating the yarn.lock
file, or if any other part of the build process starts producing unignored
files, the CI build will fail, so that the problem can be corrected before the
PR is merged.
 2019-05-01 04:04:24 -05:00
Peter Cottle
761eb9e5ef
Merge pull request #576 from eatdrinksleepcode/yarn-README 
Update README reference from npm to yarn
 2019-04-30 19:10:05 -07:00
Peter Cottle
97fa118a93
Merge pull request #575 from eatdrinksleepcode/update-yarn-lock-for-grunt-update 
Update yarn.lock file
 2019-04-30 19:09:41 -07:00
David Nelson
9f51202e60 Update README reference from npm to yarn 2019-04-30 20:12:29 -05:00
David Nelson
b5f18c4b2b Update yarn.lock file 
A number of recent commits have updated versions in package.json without
updating the yarn.lock file. This commit brings the yarn.lock file up to date.
 2019-04-30 20:05:06 -05:00