{"thread":{"id":"1313","subject":"[PATCH] tutorial: mention \"git clone\" records .git/branches/origin","startedAt":"2005-07-23T02:13:07Z","lastAt":"2005-07-23T02:13:07Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"6365","messageId":"7vwtni5ky4.fsf@assigned-by-dhcp.cox.net","threadId":"1313","inReplyTo":null,"subject":"[PATCH] tutorial: mention \"git clone\" records .git/branches/origin","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-07-23T02:13:07Z","receivedAt":"2005-07-23T02:13:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Update the recommended workflow for individual developers.\nWhile they are tracking the origin, refs/heads/origin is updated\nby \"git fetch\", so there is no need to manually copy FETCH_HEAD\nto refs/heads/ anywhere.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n\n Documentation/tutorial.txt |   48 ++++++++++++++++++++------------------------\n 1 files changed, 22 insertions(+), 26 deletions(-)\n\n6a1a7bd322037c65a4325798ddd76024d99dff3d\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -1042,7 +1042,8 @@ A recommended work cycle for a \"subsyste\n on that project and has own \"public repository\" goes like this:\n \n  (1) Prepare your work repository, by \"git clone\" the public\n-     repository of the \"project lead\".\n+     repository of the \"project lead\".  The URL used for the\n+     initial cloning is stored in .git/branches/origin.\n \n  (2) Prepare a public repository accessible to others.\n \n@@ -1051,7 +1052,7 @@ on that project and has own \"public repo\n      currently not automated.\n \n  (4) Push into the public repository from your primary\n-     repository.  Run \"git repack\" (and possibly \"git\n+     repository.  Run \"git repack\", and possibly \"git\n      prune-packed\" if the transport used for pulling from your\n      repository supports packed repositories.\n \n@@ -1076,30 +1077,25 @@ A recommended work cycle for an \"individ\n not have a \"public\" repository is somewhat different.  It goes\n like this:\n \n- (1) Prepare your work repositories, by \"git clone\" the public\n-     repository of the \"project lead\" (or \"subsystem\n-     maintainer\", if you work on a subsystem).\n-\n- (2) Copy .git/refs/master to .git/refs/upstream.\n-\n- (3) Do your work there.  Make commits.\n-\n- (4) Run \"git fetch\" from the public repository of your upstream\n-     every once in a while.  This does only the first half of\n-     \"git pull\" but does not merge.  The head of the public\n-     repository is stored in .git/FETCH_HEAD.  Copy it in\n-     .git/refs/heads/upstream.\n-\n- (5) Use \"git cherry\" to see which ones of your patches were\n-     accepted, and/or use \"git rebase\" to port your unmerged\n-     changes forward to the updated upstream.\n-\n- (6) Use \"git format-patch upstream\" to prepare patches for\n-     e-mail submission to your upstream and send it out.\n-     Go back to step (3) and continue. \n-\n-[Side Note: I think Cogito calls this upstream \"origin\".\n- Somebody care to confirm or deny?  ]\n+ (1) Prepare your work repository, by \"git clone\" the public\n+     repository of the \"project lead\" (or a \"subsystem\n+     maintainer\", if you work on a subsystem).  The URL used for\n+     the initial cloning is stored in .git/branches/origin.\n+\n+ (2) Do your work there.  Make commits.\n+\n+ (3) Run \"git fetch origin\" from the public repository of your\n+     upstream every once in a while.  This does only the first\n+     half of \"git pull\" but does not merge.  The head of the\n+     public repository is stored in .git/refs/heads/origin.\n+\n+ (4) Use \"git cherry origin\" to see which ones of your patches\n+     were accepted, and/or use \"git rebase origin\" to port your\n+     unmerged changes forward to the updated upstream.\n+\n+ (5) Use \"git format-patch origin\" to prepare patches for e-mail\n+     submission to your upstream and send it out.  Go back to\n+     step (2) and continue.\n \n \n [ to be continued.. cvsimports ]\n"}]}