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

2755 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
bf6a84dd1d [Fun] Issue #202 -- more fun when finishing! 2014-08-19 19:26:41 -07:00
Peter Cottle
7194d5c277 Merge pull request #203 from tym-network/patch-1 
Improve French translation
 2014-08-19 09:30:29 -07:00
tym-network
2ac445bfe2 Improved French translation 2014-08-19 13:33:32 +02:00
tym-network
f1096afe03 Improved French translation. 2014-08-19 12:00:31 +02:00
tym-network
63447ee3be Improved French translation 2014-08-19 11:50:20 +02:00
tym-network
13cd92d4dc Update rebasing.js 
Improved French translation.
 2014-08-19 11:33:15 +02:00
Peter Cottle
2997891874 PR #196 whoops one more, double reverse = bad 2014-08-13 19:26:20 -07:00
Peter Cottle
90c39417bb PR #196 code cleanup and solution description rather than reordering 2014-08-13 19:22:45 -07:00
Peter Cottle
ffc974e03f Merge pull request #196 from ptsoccer/master 
Improve show solution behavior that contain interactive rebase
 2014-08-13 19:06:22 -07:00
Peter Cottle
889b62bb0d README for PR #200 2014-08-10 10:28:12 -07:00
Peter Cottle
deb97cd4e8 Merge pull request #200 from ahonorat/FrenchTranslation 
French translation
 2014-08-10 10:25:08 -07:00
Alexandre Honorat
66a76faa71 Translation in french finished -- may need a rereading 2014-08-08 14:30:40 +01:00
Alexandre Honorat
64e2467144 1 new level translated in french, only 3 push levels remaining 2014-08-08 10:12:47 +01:00
Peter Cottle
24a5df5f30 Merge pull request #199 from ahonorat/FrenchTranslation 
French translation
 2014-08-07 11:37:41 -07:00
Alexandre Honorat
7d3b0b6adf 3 more levels translated in french -- 4 levels remaining 2014-08-07 14:23:31 +01:00
Alexandre Honorat
d1c285e802 Half of remote levels translated in french 2014-08-06 15:36:12 +01:00
Alexandre Honorat
97385176cd Translation (in french) for some remote levels ... 2014-08-05 16:57:58 +01:00
Peter Cottle
0db73feb87 Merge pull request #198 from ahonorat/FrenchTranslation 
French translation
 2014-07-29 19:29:44 -07:00
Alexandre Honorat
5b1af12857 Corrections to mixed levels french dialogs 2014-07-29 17:38:34 +01:00
Alexandre Honorat
cac80dec90 Three more levels translated/corrected in french 2014-07-29 14:58:02 +01:00
Peter Cottle
b6f8cebb4c Merge pull request #197 from ahonorat/FrenchTranslation 
French translation
 2014-07-28 09:48:57 -07:00
Alexandre Honorat
84bfcbed97 Correction d'erreurs 2014-07-28 16:47:15 +01:00
Alexandre Honorat
cd28b2d37f Traduction du second niveau 2014-07-28 16:23:46 +01:00
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