mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-05 12:14:28 +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
Alexandre Honorat
5a749780dc Premier niveau corrigé 2014-07-28 11:25:49 +01:00
Patrick
b27884af24 Changed some solutions that used interactive rebase to use the --initial-ordering flag 2014-07-26 15:22:54 -04:00
Patrick
00cc6349d0 Added extra flag to interactive rebase which accepts a list of commits (ordering counts). This list will then be shown to the user when the rebase dialog shows up when showing a solution that does an interactive rebase. This is so the user doesn't have to guess about what commits were picked and how they were ordered for the solution 2014-07-26 15:22:26 -04:00
Peter Cottle
2423646199 PR #195 bit of style cleanup and error handling and test for error handling 2014-07-26 21:40:45 +08:00
Peter Cottle
67413c42b6 Merge pull request #195 from ptsoccer/master 
Add testable interactive rebase
 2014-07-26 21:35:06 +08:00
Peter Cottle
3de4cd0f54 Merge pull request #193 from PLNech/master 
French translation continued
 2014-07-25 17:55:42 +08:00
Patrick
d671c531cc Added some tests for interactive rebase, including a test for the 
interactive rebase in PR 192
 2014-07-24 18:47:24 -04:00
Patrick
72cc7d6bd3 Added testable interactive rebase. It doesn't fully test everything (mainly the GUI), but is a start 2014-07-24 17:43:59 -04:00
Paul Louis NECH
8e9c890c29 French translation continued 2014-07-24 15:18:46 +02:00
Peter Cottle
b13307075d test coverage for PR #192 2014-07-22 17:35:07 +08:00
Peter Cottle
d52dac8409 rawrr no more relative links 2014-07-22 17:32:29 +08:00
Peter Cottle
faa12744c9 readme again 2014-07-22 17:31:28 +08:00
Peter Cottle
2b5548735e readme update for contributors 2014-07-22 17:30:36 +08:00
Peter Cottle
b9f4f6e9a1 Merge pull request #192 from ptsoccer/master 
Fixed couple of issues where the target branch/ref was being ignored
 2014-07-22 17:27:36 +08:00
Peter Cottle
8e71d33528 Merge pull request #191 from hermione521/newChinese 
modify and add Chinese
 2014-07-21 20:28:10 +08:00
Patrick Tully
55ac6da589 Changed checkout -B to set the branch to point at the specified commit rather than always using HEAD 2014-07-20 12:36:37 -04:00
Patrick Tully
dd58afde76 Changed interactive rebase to rebase the target branch if specified 2014-07-20 12:36:27 -04:00
Hermione
ce2a97c332 modify and add Chinese 2014-07-18 17:50:18 +08:00
Peter Cottle
2bfd12f750 Merge pull request #190 from undless/patch-1 
French translation updates
 2014-07-16 16:46:02 -07:00
Laurent Dufour
3e387bde52 French translation updates 2014-07-16 16:31:33 +02:00
Peter Cottle
81fef62afa Readme for PR #189 2014-07-03 08:25:31 -07:00
Peter Cottle
e5df396e07 Merge pull request #189 from lhyqy5/master 
zh_CN translation for tag.js and describe.js,just convert from zh_TW
 2014-07-03 08:24:29 -07:00
Eroany H Leader
d082c54ae0 Update describe.js 2014-07-03 05:30:52 +00:00
Eroany H Leader
2258a40f04 convert from zh_TW 2014-07-03 05:29:01 +00:00
Eroany H Leader
319d6a4424 convert from zh_TW 2014-07-03 05:26:10 +00:00
Peter Cottle
22f106a34d Issue #186 readme update 2014-07-01 20:18:12 -07:00
Peter Cottle
ecd848625b Resolves #184 interactive rebase upstream check 2014-06-30 20:50:01 -07:00
Peter Cottle
e78bf0cdfe Revert "Issue #180 other valid solution for juggling" 
This reverts commit cb505681dd.
 2014-06-29 18:00:44 -07:00
Peter Cottle
cb505681dd Issue #180 other valid solution for juggling 2014-06-29 17:57:15 -07:00
Peter Cottle
47f4c21b78 Fix tree positioning 2014-06-29 16:51:14 -07:00
Peter Cottle
3794dedc5c Issue #181 fix NODEMO issue 2014-06-29 16:32:27 -07:00
Peter Cottle
2402a7a469 Issue #181 cleanup and better command handling 2014-06-29 16:30:54 -07:00
Peter Cottle
507291a0c4 Resolves #181 share levels easily with gist IDs and jsonp 2014-06-29 16:22:48 -07:00
Peter Cottle
d01f1806b4 Issue #179 consolidate rebase -i and rebase codepaths 2014-06-29 15:57:44 -07:00
Peter Cottle
a04ae67c0e PR #178 remove MARCO comments 2014-06-04 18:48:31 -07:00
Peter Cottle
20c833763a PR #178 Awesome french translation fixup 2014-06-04 18:37:05 -07:00
Peter Cottle
c8dbcadb81 Merge pull request #178 from marcolivierarsenault/master 
French translation by @marcolivierarsenault
 2014-06-04 18:29:43 -07:00
Marc-Olivier Arsenault
1c5a3c242d translation 2014-06-04 20:48:40 -04:00
Marc-Olivier Arsenault
d7841e240c French translation - some files 2014-06-04 20:36:22 -04:00
Marc-Olivier Arsenault
9031b232ac First 6 files (French translation) 2014-06-01 22:20:25 -04:00
Marc-Olivier Arsenault
124cf8ce10 identification of needed traduction 2014-06-01 20:21:42 -04:00
Peter Cottle
29de85eb55 Resolves #176 explain the push.default setting for git push 2014-05-27 21:28:49 -07:00
Peter Cottle
85bd8cb255 no more PR tracking in readme 2014-05-27 21:07:57 -07:00
Peter Cottle
148ab9cc08 Resolves #175 again -- intelligently select chinese locales 2014-05-27 20:48:55 -07:00
Peter Cottle
fa0faecff0 Resolves #177 fixes start vis in level builder with new click ability 2014-05-27 12:49:34 -07:00
Peter Cottle
40d60c4bcc [INTL] Switch to browsers locale based on headers Resolves #175 2014-05-14 16:48:01 -07:00
Peter Cottle
d259a2db51 Readme and style for PR #174 2014-05-08 10:28:57 -07:00
Peter Cottle
fb138f3023 Merge pull request #174 from mgarciaisaia/spanish 
Full Spanish translation
 2014-05-08 10:18:54 -07:00
mgarciaisaia
31ea0cedd0 Full Spanish translation 2014-05-08 02:38:46 -03:00
Peter Cottle
f1686932cb Change ultra-fallback to en_US For PR #169 2014-05-07 18:42:18 -07:00