Ben Lynn [Mon, 10 Dec 2012 03:26:54 +0000 (9 19:26 -0800)]
Updated credits.
Ben Lynn [Mon, 10 Dec 2012 03:25:22 +0000 (9 19:25 -0800)]
Merge branch 'master' of https://github.com/baijum/gitmagic
Ben Lynn [Mon, 10 Dec 2012 03:24:47 +0000 (9 19:24 -0800)]
Merge branch 'patch-1' of https://github.com/gitnacho/gitmagic
Wikinaut [Wed, 7 Nov 2012 17:38:33 +0000 (7 18:38 +0100)]
small corrections German spelling and grammar
Nacho [Thu, 21 Jun 2012 08:48:48 +0000 (21 03:48 -0500)]
elimina repetición "de de"
Baiju Muthukadan [Wed, 16 May 2012 17:45:09 +0000 (16 23:15 +0530)]
New git site URL
Ben Lynn [Mon, 30 Apr 2012 07:57:38 +0000 (30 00:57 -0700)]
Merge https://github.com/vnwildman/gitmagic
Tran Ngoc Quan [Sun, 15 Apr 2012 07:11:41 +0000 (15 14:11 +0700)]
Update translation in credits.
Tran Ngoc Quan [Sun, 15 Apr 2012 06:54:31 +0000 (15 13:54 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Joël Thieffry [Fri, 13 Apr 2012 17:23:21 +0000 (13 19:23 +0200)]
FR: some more mispellings.
Ben Lynn [Thu, 12 Apr 2012 06:45:55 +0000 (11 23:45 -0700)]
Updated credits.
Ben Lynn [Thu, 12 Apr 2012 06:42:59 +0000 (11 23:42 -0700)]
Merge branch 'patch-1' of https://github.com/Nioub/gitmagic
Joël Thieffry [Wed, 11 Apr 2012 15:32:35 +0000 (11 18:32 +0300)]
Minor spelling errors.
Сергей Сергеев [Mon, 2 Apr 2012 08:35:26 +0000 (2 11:35 +0300)]
Update ru/branch.txt
Tran Ngoc Quan [Sun, 25 Mar 2012 01:40:02 +0000 (25 08:40 +0700)]
Update from english.
Tran Ngoc Quan [Sun, 25 Mar 2012 01:17:17 +0000 (25 08:17 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Ben Lynn [Tue, 13 Mar 2012 06:57:21 +0000 (12 23:57 -0700)]
Added two mirrors.
Mentioned www.gitmagic.com.
Ben Lynn [Tue, 13 Mar 2012 06:22:53 +0000 (12 23:22 -0700)]
Merge branch 'patch-1' of https://github.com/ggray/gitmagic
Сергей Сергеев [Wed, 7 Mar 2012 11:16:26 +0000 (7 13:16 +0200)]
mistype
Сергей Сергеев [Wed, 7 Mar 2012 11:11:28 +0000 (7 13:11 +0200)]
a bit af russian terms corrections
David Toca [Wed, 7 Mar 2012 02:16:48 +0000 (6 21:16 -0500)]
deleting extra line in English
Tran Ngoc Quan [Sun, 4 Mar 2012 02:19:08 +0000 (4 09:19 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Tran Ngoc Quan [Mon, 20 Feb 2012 00:06:56 +0000 (20 07:06 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Ben Lynn [Sat, 18 Feb 2012 03:10:11 +0000 (17 19:10 -0800)]
Merge git://github.com/blynn/gitmagic
Ben Lynn [Sat, 18 Feb 2012 03:07:05 +0000 (17 19:07 -0800)]
Merge branch 'master' of https://github.com/vnwildman/gitmagic
Ben Lynn [Sat, 18 Feb 2012 02:53:02 +0000 (17 18:53 -0800)]
A couple of corrections.
git init --bare fails on older versions of Git.
Ben Lynn [Sat, 18 Feb 2012 03:05:16 +0000 (17 19:05 -0800)]
Merge pull request #16 from oferrigni/Fixing.MacOS.Issue.13
Add -e for compliance on mac with sed.
Ben Lynn [Sat, 18 Feb 2012 03:01:49 +0000 (17 19:01 -0800)]
Merge pull request #15 from rlespinasse/master
FR translate : fix the lack of cohesion between examples
Tran Ngoc Quan [Fri, 3 Feb 2012 06:28:52 +0000 (3 13:28 +0700)]
Fix Ubuntu package URLs.
Oliver Ferrigni [Thu, 2 Feb 2012 19:13:05 +0000 (2 13:13 -0600)]
Eliminted extra space.
Oliver
Oliver Ferrigni [Thu, 2 Feb 2012 17:39:57 +0000 (2 11:39 -0600)]
Corrected to get backup files right.
Oliver
Oliver Ferrigni [Wed, 1 Feb 2012 20:55:49 +0000 (1 14:55 -0600)]
Add -e for compliance on mac with sed.
Oliver
Romain Lespinasse [Sun, 29 Jan 2012 20:19:35 +0000 (29 21:19 +0100)]
fix the lack of cohesion with 'git checkout -b chef'
Ben Lynn [Mon, 16 Jan 2012 07:31:20 +0000 (15 23:31 -0800)]
Merge https://github.com/vnwildman/gitmagic
Ben Lynn [Mon, 16 Jan 2012 07:25:11 +0000 (15 23:25 -0800)]
Corrected links in Russian preface.
Thanks to Rushan for reporting them.
Tran Ngoc Quan [Fri, 13 Jan 2012 07:09:57 +0000 (13 14:09 +0700)]
Update vi/preface.txt after merge from origin project.
Tran Ngoc Quan [Fri, 13 Jan 2012 06:43:26 +0000 (13 13:43 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Bo-Yi Wu [Sun, 18 Dec 2011 12:54:19 +0000 (18 20:54 +0800)]
translate zh_tw/preface.txt
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
Ben Lynn [Sun, 27 Nov 2011 22:08:29 +0000 (27 14:08 -0800)]
Added Assembla mirror.
Tran Ngoc Quan [Mon, 21 Nov 2011 06:25:44 +0000 (21 13:25 +0700)]
Fix stupid error: source text file must in ANSI as UTF-8, not just UTF-8.
Tran Ngoc Quan [Mon, 21 Nov 2011 01:32:00 +0000 (21 08:32 +0700)]
Minor edit and fix typos
Rafa de Castro [Mon, 14 Nov 2011 13:38:39 +0000 (14 14:38 +0100)]
Added assembla to git free hosts
Tran Ngoc Quan [Fri, 11 Nov 2011 07:41:53 +0000 (11 14:41 +0700)]
Update translation for Vietnamese from
9d0f8fae commit.
Tran Ngoc Quan [Fri, 11 Nov 2011 07:33:43 +0000 (11 14:33 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Ben Lynn [Thu, 10 Nov 2011 19:28:32 +0000 (10 11:28 -0800)]
Fixed user manual link.
Tran Ngoc Quan [Tue, 1 Nov 2011 02:16:18 +0000 (1 09:16 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Ben Lynn [Thu, 28 Jul 2011 08:28:20 +0000 (28 01:28 -0700)]
Minor edits.
Tran Ngoc Quan [Sat, 16 Jul 2011 07:54:01 +0000 (16 14:54 +0700)]
Merge branch 'master' of https://github.com/blynn/gitmagic
Ben Lynn [Tue, 12 Jul 2011 06:16:56 +0000 (11 23:16 -0700)]
Merge https://github.com/soniah/gitmagic
Ben Lynn [Tue, 12 Jul 2011 04:44:33 +0000 (11 21:44 -0700)]
Merge https://github.com/lordofbikes/gitmagic
Sonia Hamilton [Mon, 11 Jul 2011 00:29:36 +0000 (11 10:29 +1000)]
Added more details to rebasing - cloning, --abort
lordofbikes [Sun, 10 Jul 2011 15:30:50 +0000 (10 17:30 +0200)]
new: finished translation of de/preface.txt
lordofbikes [Sun, 10 Jul 2011 13:17:39 +0000 (10 15:17 +0200)]
new: finished translating de/drawbacks.txt
Ben Lynn [Fri, 8 Jul 2011 07:56:28 +0000 (8 00:56 -0700)]
Edited previous commit to suit my style.
Ben Lynn [Fri, 8 Jul 2011 07:24:44 +0000 (8 00:24 -0700)]
Merge https://github.com/soniah/gitmagic
lordofbikes [Thu, 7 Jul 2011 17:06:29 +0000 (7 19:06 +0200)]
edit: corrected typos, solved problem with umlauts
Sonia Hamilton [Thu, 7 Jul 2011 05:25:20 +0000 (7 15:25 +1000)]
Added a more detailed explanation of rebase squashing
lordofbikes [Tue, 5 Jul 2011 21:49:18 +0000 (5 23:49 +0200)]
new: translated de/secrets.txt
JunJie Nan [Tue, 5 Jul 2011 08:46:16 +0000 (5 16:46 +0800)]
Chinese translation lastest update
JunJie Nan [Tue, 5 Jul 2011 07:05:21 +0000 (5 15:05 +0800)]
Merge branch 'master' of git://github.com/blynn/gitmagic
lordofbikes [Mon, 4 Jul 2011 16:53:05 +0000 (4 18:53 +0200)]
edit: typos in de/grandmaster.txt
lordofbikes [Mon, 4 Jul 2011 16:29:52 +0000 (4 18:29 +0200)]
edit: translated updated de/pot/*.po files and generate de/*.txt files after merge upstream/master
lordofbikes [Mon, 4 Jul 2011 16:24:52 +0000 (4 18:24 +0200)]
new: added the po4all gereated de/grandmaster.txt
lordofbikes [Sun, 3 Jul 2011 20:38:41 +0000 (3 22:38 +0200)]
Merge remote branch 'upstream/master'
lordofbikes [Sun, 3 Jul 2011 17:55:17 +0000 (3 19:55 +0200)]
edit: finished grandmaster.txt
lordofbikes [Sun, 3 Jul 2011 17:54:16 +0000 (3 19:54 +0200)]
edit: translated one forgotten section
Benoit Tuduri [Fri, 24 Jun 2011 19:42:03 +0000 (24 21:42 +0200)]
fix masculine adjective by feminine adjective.
JunJie Nan [Fri, 24 Jun 2011 07:36:45 +0000 (24 15:36 +0800)]
Merge branch 'master' of git://github.com/blynn/gitmagic
Ben Lynn [Thu, 16 Jun 2011 22:15:34 +0000 (16 15:15 -0700)]
Updated "Classic source control".
Ben Lynn [Sun, 12 Jun 2011 18:45:16 +0000 (12 11:45 -0700)]
Merge https://github.com/t-t/gitmagic
Tran Ngoc Quan [Sat, 11 Jun 2011 07:31:19 +0000 (11 14:31 +0700)]
Minor fix typos.
JunJie Nan [Fri, 3 Jun 2011 08:59:22 +0000 (3 16:59 +0800)]
Merge branch 'master' of git://github.com/blynn/gitmagic
Tran Ngoc Quan [Sun, 1 May 2011 00:59:58 +0000 (1 07:59 +0700)]
Retranslated and update Vietnamese.
JunJie Nan [Tue, 26 Apr 2011 06:27:29 +0000 (26 14:27 +0800)]
Introduction enhancement
JunJie Nan [Fri, 15 Apr 2011 01:45:20 +0000 (15 09:45 +0800)]
Remove miss left
Tikhon Tarnavsky [Tue, 5 Apr 2011 06:11:46 +0000 (5 09:11 +0300)]
ru/drawbacks.txt: misprint fixed
Tikhon Tarnavsky [Mon, 28 Mar 2011 17:58:39 +0000 (28 20:58 +0300)]
ru/multiplayer.txt: misprint fixed
JunJie Nan [Mon, 28 Mar 2011 03:37:04 +0000 (28 11:37 +0800)]
zh_cn zh_tw PDF support
Tikhon Tarnavsky [Wed, 23 Mar 2011 09:09:14 +0000 (23 11:09 +0200)]
ru/* final corrections
Tikhon Tarnavsky [Thu, 17 Mar 2011 17:59:27 +0000 (17 19:59 +0200)]
Merge remote-tracking branch 'lynn/master'
Tikhon Tarnavsky [Thu, 17 Mar 2011 17:57:50 +0000 (17 19:57 +0200)]
ru/* updated
Tikhon Tarnavsky [Thu, 17 Mar 2011 16:38:03 +0000 (17 18:38 +0200)]
ru/*: магия -> волшебство
Tikhon Tarnavsky [Thu, 17 Mar 2011 16:36:23 +0000 (17 18:36 +0200)]
Makefile: added -p to mkdir to avoid error message when dir exists.
JunJie Nan [Thu, 10 Mar 2011 10:17:45 +0000 (10 18:17 +0800)]
Merge branch 'master' of git://github.com/blynn/gitmagic
JunJie Nan [Tue, 8 Mar 2011 08:35:55 +0000 (8 16:35 +0800)]
Fix link
JunJie Nan [Tue, 8 Mar 2011 08:29:54 +0000 (8 16:29 +0800)]
Fix typo error
Ben Lynn [Tue, 8 Mar 2011 08:19:58 +0000 (8 00:19 -0800)]
Added Vietnamese support to the new Makefile.
Ben Lynn [Tue, 8 Mar 2011 08:04:21 +0000 (8 00:04 -0800)]
Merge https://github.com/lordofbikes/gitmagic
JunJie Nan [Tue, 8 Mar 2011 02:10:03 +0000 (8 10:10 +0800)]
Merge branch 'master' of github.com:nanjj/gitmagic
JunJie Nan [Tue, 8 Mar 2011 01:43:15 +0000 (8 09:43 +0800)]
Correct format error
JunJie Nan [Tue, 8 Mar 2011 01:55:26 +0000 (8 09:55 +0800)]
Merge branch 'master' of github.com:nanjj/gitmagic
JunJie Nan [Tue, 8 Mar 2011 01:43:15 +0000 (8 09:43 +0800)]
Correct format error
JunJie Nan [Tue, 8 Mar 2011 00:45:39 +0000 (8 08:45 +0800)]
cddf translation and .gitignore update
JunJie Nan [Tue, 8 Mar 2011 01:48:57 +0000 (8 09:48 +0800)]
Merge branch 'master' of github.com:nanjj/gitmagic
JunJie Nan [Tue, 8 Mar 2011 01:43:15 +0000 (8 09:43 +0800)]
Correct format error
JunJie Nan [Tue, 8 Mar 2011 01:43:15 +0000 (8 09:43 +0800)]
Correct format error
JunJie Nan [Tue, 8 Mar 2011 00:45:39 +0000 (8 08:45 +0800)]
cddfa translation and .gitignore update
Ben Lynn [Mon, 7 Mar 2011 18:51:18 +0000 (7 10:51 -0800)]
Fixed links to Chinese translations.
Updated translation tips.
Ben Lynn [Mon, 7 Mar 2011 09:57:20 +0000 (7 01:57 -0800)]
Merge https://github.com/nanjj/gitmagic
Ben Lynn [Mon, 7 Mar 2011 09:54:49 +0000 (7 01:54 -0800)]
Removed Makefile targets which only I use.