0a005ab8b1ec0f965c2489d4797d75c0c91c9df4 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/51e4a7966786e66a02da8860f6490157270fbe8f 51e4a7966786e66a02da8860f6490157270fbe8f 2009-11-17T23:09:24-08:00 2009-11-17T23:09:24-08:00 Makefile fix for AsciiDoc 8.5.1. 9e4fcd3a851e144b67d829e23d49a0e90f69c0b7 Ben Lynn benlynn@gmail.com 30f9a1ad4716ce3dbd13e33d67dc54d99ab19a0c Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/0a005ab8b1ec0f965c2489d4797d75c0c91c9df4 0a005ab8b1ec0f965c2489d4797d75c0c91c9df4 2009-11-15T15:25:52-08:00 2009-11-15T15:22:51-08:00 Fixes thanks to Sébastien Hinderer. Minor edits. c18e454d650b9ba7a2e434c8b7761de79b070290 Ben Lynn benlynn@gmail.com abd5709ce87737e37de8edaf39b1cb2bda520a0b Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/30f9a1ad4716ce3dbd13e33d67dc54d99ab19a0c 30f9a1ad4716ce3dbd13e33d67dc54d99ab19a0c 2009-10-14T13:33:39-07:00 2009-10-14T13:33:39-07:00 Updated credits. 8db2a2586a9eb2ddb8553870acfbcfa27c053c7e Ben Lynn benlynn@gmail.com 5075f6e3a8f434d293f3dc325c2a4987840e3355 Miklos Vajna vmiklos@frugalware.org http://github.com/blynn/gitmagic/commit/abd5709ce87737e37de8edaf39b1cb2bda520a0b abd5709ce87737e37de8edaf39b1cb2bda520a0b 2009-10-14T13:32:46-07:00 2009-10-04T13:30:26-07:00 Remove two no longer relevant problem from the drawbacks section Output of the first command is now: $ git branch -D foo error: Unable to create '.git/packed-refs.lock': File exists. If no other git process is currently running, this probably means a git process crashed in this repository earlier. Make sure no other git process is running and remove the file manually to continue. error: cannot delete 'refs/heads/foo' from packed refs error: Error deleting branch 'foo' The second: $ git push (...) warning: updating the current branch warning: Updating the currently checked out branch may cause confusion, warning: as the index and work tree do not reflect changes that are in HEAD. warning: As a result, you may see the changes you just pushed into it warning: reverted when you run 'git diff' over there, and you may want warning: to run 'git reset --hard' before starting to work to recover. warning: warning: You can set 'receive.denyCurrentBranch' configuration variable to warning: 'refuse' in the remote repository to forbid pushing into its warning: current branch. warning: To allow pushing into the current branch, you can set it to 'ignore'; warning: but this is not recommended unless you arranged to update its work warning: tree to match what you pushed in some other way. warning: warning: To squelch this message, you can set it to 'warn'. warning: warning: Note that the default will change in a future version of git warning: to refuse updating the current branch unless you have the warning: configuration variable set to either 'ignore' or 'warn'. 4a7c6d85b60439da30dd48b8dcc5c995618514d0 Ben Lynn benlynn@gmail.com fb8cc908692eb50e06f617fa3dd0a75a715cf15f Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/5075f6e3a8f434d293f3dc325c2a4987840e3355 5075f6e3a8f434d293f3dc325c2a4987840e3355 2009-10-09T16:44:12-07:00 2009-10-09T16:44:12-07:00 Updated credits. 4bb22fa81c8a2b0a4cacf8681d42f016c230c640 Ben Lynn benlynn@gmail.com e8a5e6651123e08e068a482ccd2b944cb3a24ee1 9872d7f51cab2fed4ca3d58c32d1bd81205b6efc Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/fb8cc908692eb50e06f617fa3dd0a75a715cf15f fb8cc908692eb50e06f617fa3dd0a75a715cf15f 2009-10-09T16:41:31-07:00 2009-10-09T16:41:31-07:00 Merge branch 'typos' of git://github.com/sunny256/gitmagic a4bca1c983504ee6dd580d89e2294f80aff3c3d2 Ben Lynn benlynn@gmail.com 1e5780f658962f8f9b01638059b27275cfda095c Ralf Recker ralf.recker@googlemail.com http://github.com/blynn/gitmagic/commit/e8a5e6651123e08e068a482ccd2b944cb3a24ee1 e8a5e6651123e08e068a482ccd2b944cb3a24ee1 2009-10-09T16:38:13-07:00 2009-09-17T13:18:00-07:00 Fixed a typo in en/grandmaster.txt caeeee9f87923faac6a1d25a2a592b19cda3e94b Ben Lynn benlynn@gmail.com 1e5780f658962f8f9b01638059b27275cfda095c Øyvind A. Holm sunny@sunbase.org http://github.com/blynn/gitmagic/commit/9872d7f51cab2fed4ca3d58c32d1bd81205b6efc 9872d7f51cab2fed4ca3d58c32d1bd81205b6efc 2009-09-25T17:45:46-07:00 2009-09-25T17:45:46-07:00 Typo fixes. a4bca1c983504ee6dd580d89e2294f80aff3c3d2 Øyvind A. Holm sunny@sunbase.org 8b68cba6e49c31864824be5371bbfd587ab257cd Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/1e5780f658962f8f9b01638059b27275cfda095c 1e5780f658962f8f9b01638059b27275cfda095c 2009-09-08T20:39:02-07:00 2009-09-08T20:39:02-07:00 New Debian package maintainer. 1797812d341fb16b929171b96d4b91ad1135eb67 Ben Lynn benlynn@gmail.com c856fe230d218688b314697794db185fbca1efe6 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/8b68cba6e49c31864824be5371bbfd587ab257cd 8b68cba6e49c31864824be5371bbfd587ab257cd 2009-09-01T02:46:05-07:00 2009-09-01T02:46:05-07:00 Minor tweak suggested by Andy Somerville. aa081ad4e10f26f2260a106bceed7b5b41b64485 Ben Lynn benlynn@gmail.com 7d8bfca7c701f8b63485c5cc134c175d6a865e16 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/c856fe230d218688b314697794db185fbca1efe6 c856fe230d218688b314697794db185fbca1efe6 2009-08-05T14:47:07-07:00 2009-08-05T14:47:07-07:00 Rewrote "Uninterrupted Workflow". 9193d1bb6716625816567696a8dd186f03e45d02 Ben Lynn benlynn@gmail.com 8f4217a3595c8427318cb6b63acad84efd30c1c0 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/7d8bfca7c701f8b63485c5cc134c175d6a865e16 7d8bfca7c701f8b63485c5cc134c175d6a865e16 2009-07-15T12:55:35-07:00 2009-07-15T12:55:35-07:00 Reorganized "Thanks!". Hopefully the names stand out more. 37ee052986a5936306af5b46ea4ac6b8d36566fa Ben Lynn benlynn@gmail.com caa7431e3e0942164a03c0d12ca2c4c75fe00060 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/8f4217a3595c8427318cb6b63acad84efd30c1c0 8f4217a3595c8427318cb6b63acad84efd30c1c0 2009-07-15T12:36:01-07:00 2009-07-15T12:36:01-07:00 Linked to Portuguese translation. Thanks to Leonardo Siqueira Rodrigues. 862f6f594112dc5393498189dec6a079dacb6ca7 Ben Lynn benlynn@gmail.com a557a7d1170ec19a7cd0be6795c808f45f929f01 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/caa7431e3e0942164a03c0d12ca2c4c75fe00060 caa7431e3e0942164a03c0d12ca2c4c75fe00060 2009-06-26T15:42:31-07:00 2009-06-26T15:38:39-07:00 Interface quirks. 9d74ecb9101fcdfbf497db1fffcce16aaf177548 Ben Lynn benlynn@gmail.com feed681568d9453f6472d003dbdc45a06d49175b Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/a557a7d1170ec19a7cd0be6795c808f45f929f01 a557a7d1170ec19a7cd0be6795c808f45f929f01 2009-06-26T14:30:38-07:00 2009-06-26T14:12:33-07:00 Forgot I had introduced push in an earlier chapter. 71159733098fed5947f7e934d26d5f5c4d48a0b4 Ben Lynn benlynn@gmail.com 8a574254c5c48faa8b7cd744b532a6f03f375c5b Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/feed681568d9453f6472d003dbdc45a06d49175b feed681568d9453f6472d003dbdc45a06d49175b 2009-06-26T13:57:18-07:00 2009-06-26T02:10:47-07:00 Split Grandmastery chapter. It was getting too big. Also, the chapter on shortcomings is now an appendix. I like having the last chapter end with a section related to the opening sentence of the preface. 40f2a5f666c27495dbf2018b5a230a9c661debd0 Ben Lynn benlynn@gmail.com 4eb056fb9734442684087e82477591779459396f Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/8a574254c5c48faa8b7cd744b532a6f03f375c5b 8a574254c5c48faa8b7cd744b532a6f03f375c5b 2009-06-25T02:12:57-07:00 2009-06-25T02:12:12-07:00 Changed hook example. 98974724cdec96a649e66c6cbf5d9f4b4f1aea90 Ben Lynn benlynn@gmail.com f6bc35cb239b3b9845ab5718b8fe49eee711bdb1 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/4eb056fb9734442684087e82477591779459396f 4eb056fb9734442684087e82477591779459396f 2009-06-25T01:58:54-07:00 2009-06-25T01:58:54-07:00 Moved ChangeLog generation tip. a476d156fa4f2e42578e6bbd364c3df4daa0e31b Ben Lynn benlynn@gmail.com 8ccfe9f31153016e3cdb81c035eb06e186def080 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/f6bc35cb239b3b9845ab5718b8fe49eee711bdb1 f6bc35cb239b3b9845ab5718b8fe49eee711bdb1 2009-06-25T01:51:08-07:00 2009-06-25T01:45:46-07:00 Wrote about hooks. Removed trailing whitespace. 1f8267fdeec2b4e35a906008dd4892a00a5cd7db Ben Lynn benlynn@gmail.com c425dc57f6ef1919f82c05ac80d3f9e6b8997673 Rodrigo Toledo kewl@HAL9001 http://github.com/blynn/gitmagic/commit/8ccfe9f31153016e3cdb81c035eb06e186def080 8ccfe9f31153016e3cdb81c035eb06e186def080 2009-06-24T07:08:05-07:00 2009-06-24T07:08:05-07:00 Now really added branch.txt 85bb027689bab733a8c02783acc0b25f69d1286c Rodrigo Toledo kewl@HAL9001 f920d4f992746121c78645c4bce9c1c36bb6c1ca Rodrigo Toledo kewl@HAL9001 http://github.com/blynn/gitmagic/commit/c425dc57f6ef1919f82c05ac80d3f9e6b8997673 c425dc57f6ef1919f82c05ac80d3f9e6b8997673 2009-06-24T07:07:30-07:00 2009-06-24T07:07:30-07:00 Now really added clone.txt 1f23125cc02b28e894f67ed81bdb10876fb98413 Rodrigo Toledo kewl@HAL9001 a8d634656e1810a5658a5a16685e90f04cc3722b Rodrigo Toledo kewl@HAL9001 http://github.com/blynn/gitmagic/commit/f920d4f992746121c78645c4bce9c1c36bb6c1ca f920d4f992746121c78645c4bce9c1c36bb6c1ca 2009-06-23T21:38:25-07:00 2009-06-23T21:38:25-07:00 Branch fully translated 84d80dad15f6f1762103f18a716d32259cc59335 Rodrigo Toledo kewl@HAL9001 46c05532226868b8b3b121d9320c0150491fd181 Rodrigo Toledo kewl@HAL9001 http://github.com/blynn/gitmagic/commit/a8d634656e1810a5658a5a16685e90f04cc3722b a8d634656e1810a5658a5a16685e90f04cc3722b 2009-06-23T19:36:24-07:00 2009-06-23T19:36:24-07:00 Clone fully translated d7cbf007b20717aff98c13c85b1790da27403f8d Rodrigo Toledo kewl@HAL9001 b8c8a57792ea3105ee2589bf9a8a97ddeb3edcef Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/46c05532226868b8b3b121d9320c0150491fd181 46c05532226868b8b3b121d9320c0150491fd181 2009-06-23T14:11:46-07:00 2009-06-23T14:11:46-07:00 Simplify an example. Thanks to Keith Rarick. 05c081e7bd5e5693db1f1a5ad82dcef10bcc4a02 Ben Lynn benlynn@gmail.com e9561dc4f16aaaf6b5c183423980760dd39e01ee Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/b8c8a57792ea3105ee2589bf9a8a97ddeb3edcef b8c8a57792ea3105ee2589bf9a8a97ddeb3edcef 2009-06-20T14:04:48-07:00 2009-06-20T14:04:48-07:00 I had forgotten to add translate.txt. cc415ea57ab53d8100810739ee2062ae1643ca66 Ben Lynn benlynn@gmail.com 9b5b4ef73f24d471f9241b89f1dfb4b928f8fd80 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/e9561dc4f16aaaf6b5c183423980760dd39e01ee e9561dc4f16aaaf6b5c183423980760dd39e01ee 2009-06-09T01:48:55-07:00 2009-06-09T00:50:13-07:00 Minor changes. Despite its wordiness, I prefer my original version of the Roman numerals statement. 8a229341f5ad9fe8ec0fdf146a20b733c860c4d9 Ben Lynn benlynn@gmail.com e39c56dc7d659d459b55546e701ce9652bab4681 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/9b5b4ef73f24d471f9241b89f1dfb4b928f8fd80 9b5b4ef73f24d471f9241b89f1dfb4b928f8fd80 2009-06-09T00:02:15-07:00 2009-06-09T00:02:15-07:00 Moved translation hints to appendix. 74b1f3354b477b5c5994e953fbf2498e6a1ac2b7 Ben Lynn benlynn@gmail.com b7a850e0143d857e3294ff864ac726ca0ac9069c Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/e39c56dc7d659d459b55546e701ce9652bab4681 e39c56dc7d659d459b55546e701ce9652bab4681 2009-06-08T23:47:50-07:00 2009-06-08T23:47:50-07:00 In newer AsciiDoc versions, should not escape "--". d1a6093bf96793c4c6778a27ac1685582cd21bc7 Ben Lynn benlynn@gmail.com b43860c887a0675d4e8470716bdf132752947102 Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/b7a850e0143d857e3294ff864ac726ca0ac9069c b7a850e0143d857e3294ff864ac726ca0ac9069c 2009-06-05T10:45:20-07:00 2009-06-05T02:14:35-07:00 Wrote about remote repositories. Amended early pull examples so they work in the original repository, and not just the clone. 2f4b973ae09a1e1f57db0b524bbbd1c9af941887 Ben Lynn benlynn@gmail.com a5bb85194e0c2417b111a65c7c6c6044973a12ae Ben Lynn benlynn@gmail.com http://github.com/blynn/gitmagic/commit/b43860c887a0675d4e8470716bdf132752947102 b43860c887a0675d4e8470716bdf132752947102 2009-05-07T02:41:21-07:00 2009-05-07T02:34:18-07:00 Minor edits to The Object Database section. de3423965c80ee1a77f454404ec95c9d498871ad Ben Lynn benlynn@gmail.com