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

2182 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
108ab07f93 ALL GIT STUFF DONE YES 2013-03-02 13:27:27 -08:00
Peter Cottle
9b4de12074 moar 2013-03-02 13:09:12 -08:00
Peter Cottle
efabfa4378 partway through git strings 2013-03-02 12:57:34 -08:00
Peter Cottle
d17d131d24 Firefox prompt huge fix, Issue #59 2013-03-02 10:39:54 -08:00
Peter Cottle
a7c2b8936c readme 2013-02-25 22:16:41 -08:00
Peter Cottle
943aa12d87 Dont count typo errors Issue #60 2013-02-25 22:16:11 -08:00
Peter Cottle
fab9bade1e readme 2013-02-24 23:38:58 -08:00
Peter Cottle
24af6d083e new solution command Issue #57 2013-02-24 22:46:49 -08:00
Peter Cottle
80a540e172 Now can cherry pick multiple commits in a row like git usage Issue #57 2013-02-24 22:44:49 -08:00
Peter Cottle
3523d28416 fixes silly error in next level dialog Issue #56 2013-02-24 22:03:41 -08:00
Peter Cottle
956d559697 Firefox CSS tweaks Issue #53 2013-02-24 01:22:33 -08:00
Peter Cottle
bd62fa735e intl dom refresh when locale changes final push for Issue #42 2013-02-24 00:33:22 -08:00
Peter Cottle
1b0d836a42 rebuild and no more uppercase 2013-02-24 00:11:39 -08:00
Peter Cottle
5e7042c64b rebuild for Issue #55 2013-02-23 23:37:05 -08:00
Peter Cottle
d99498076e Merge pull request #55 from donkirkby/patch-1 
Typo fixes
 2013-02-23 23:36:04 -08:00
Peter Cottle
88db1d4034 readme 2013-02-23 23:34:52 -08:00
Peter Cottle
a0c8c34522 big intl update, only polishing left, Issue #42 2013-02-23 23:31:30 -08:00
Peter Cottle
7e165c6fdc zomg so many keys 2013-02-23 23:07:03 -08:00
Peter Cottle
9048f09d9f a bunch of keys from level directory 2013-02-23 22:15:37 -08:00
Don Kirkby
c58e4f687f Grammar tweak: "method of your choosing." 2013-02-23 21:36:41 -08:00
Don Kirkby
93dfb67075 Typo "chose" -> "choose". 2013-02-23 21:34:44 -08:00
Peter Cottle
3adec8d88a more intl Issue #42 2013-02-23 21:19:52 -08:00
Peter Cottle
eedce6616a before big intl merge on levels 2013-02-23 20:54:14 -08:00
Peter Cottle
9a497cfbad typo 2013-02-23 15:01:07 -08:00
Peter Cottle
cded665873 imported Korean dialogs Issue #42 other dialogs, level names, etc will come later 2013-02-23 15:00:24 -08:00
Peter Cottle
cc5466b038 Imported all zh_CN dialogs and added locale changing support Issue #42 2013-02-23 14:31:40 -08:00
Peter Cottle
2617357460 Basic dialog intl support for level dialogs, Issue #42 2013-02-23 13:32:45 -08:00
Peter Cottle
2837315c7d no console log 2013-02-21 09:14:15 -08:00
Peter Cottle
f8a92580bd Scroll bar FF fixes Issue #51 2013-02-21 09:12:32 -08:00
Peter Cottle
d1962d2a2e css typo thanks @MaPePer Issue #51 2013-02-21 09:06:54 -08:00
Peter Cottle
8cfd9ebd19 readme 2013-02-20 20:56:22 -08:00
Peter Cottle
6748f66dfc readme 2013-02-20 20:53:14 -08:00
Peter Cottle
b6785b240c rebuild 2013-02-20 20:52:28 -08:00
Peter Cottle
c50b413f3a Merge pull request #49 from aschrab/merge-args 
Fix merge argument handling
 2013-02-20 20:38:58 -08:00
Peter Cottle
15dd10f034 Merge pull request #47 from aschrab/buildfix 
Adjustments to building
 2013-02-20 20:33:09 -08:00
Peter Cottle
3aad020f7d rebuild 2013-02-20 20:29:37 -08:00
Peter Cottle
39be0644ab rebuid 2013-02-20 20:20:07 -08:00
Peter Cottle
0cd82c921a firefox icon CSS 2013-02-20 20:19:38 -08:00
Peter Cottle
e2b805763d Firefox CSS fixes, Issue #9 thanks Frode Austvik 2013-02-20 20:18:13 -08:00
Peter Cottle
cae36e1301 readme 2013-02-20 20:07:23 -08:00
Peter Cottle
851de6118e Merge pull request #46 from aschrab/editorconfig 
Add .editorconfig file
 2013-02-20 20:05:47 -08:00
Peter Cottle
9b59e47572 Fixes Issue #43 2013-02-20 20:03:51 -08:00
Aaron Schrab
4d6d247d01 No multiple arguments for merge 
`git merge` should only be given multiple arguments if doing an octopus
merge which isn't currently supported.  Require that exactly one
argument be given, and always use HEAD as the currentLocation.
 2013-02-20 22:46:45 -05:00
Aaron Schrab
df4452290b Target branch can't be second argument to merge 
Remove instances in tutorial where the target branch for a merge is
supplied as a second argument to `git merge`.  The target branch for
merge is always the current branch.
 2013-02-20 22:45:03 -05:00
Peter Cottle
a2e89f592d Allow for multiple spaces in git commands Issue #44 2013-02-20 19:36:17 -08:00
Aaron Schrab
ac4e5c65c6 Add levels symlink at top level 
Without this link running `grunt build` gives me errors like:

    Running "browserify:build/bundle.js" (browserify) task
    Fatal error: Cannot find module: "../../levels/intro/1" from directory "/home/ats/vc/learnGitBranching/src/levels" while processing file /home/ats/vc/learnGitBranching/src/levels/index.js
 2013-02-20 18:13:17 -05:00
Aaron Schrab
15f7d0f663 Fix path to levels from level arbiter 
Need to go up to directories from the level arbiter to get to the
directory containing level definitions.
 2013-02-20 18:13:17 -05:00
Aaron Schrab
20b16e5301 Fix capitalization of sandboxCommands file 
On case-sensitive file systems, need to use correct case in require()
calls.
 2013-02-20 18:13:17 -05:00
Aaron Schrab
939ea0c767 Rebuild for changes to handling of relative refs 2013-02-20 18:12:53 -05:00
Aaron Schrab
8da68375dd Remove obsolete numBackFrom method 
The numBackFrom method is no longer called from anywhere with the
changes from the previous commit to change how relative references are
handled.
 2013-02-20 18:12:53 -05:00