{"thread":{"id":"25153","subject":"[PATCH] Improvements to `git checkout -h`","startedAt":"2010-09-19T19:41:25Z","lastAt":"2010-09-27T17:54:12Z","messageCount":7,"participants":["Knittl","Ævar Arnfjörð Bjarmason","Matthieu Moy","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"151007","messageId":"AANLkTikra1iE5JpXvvPnNcwE=XEDF6B=ubCteEi77dqX@mail.gmail.com","threadId":"25153","inReplyTo":null,"subject":"[PATCH] Improvements to `git checkout -h`","fromName":"Knittl","fromEmail":"knittl89@googlemail.com","sentAt":"2010-09-19T19:41:25Z","receivedAt":"2010-09-19T19:41:25Z","isPatch":true,"sender":{"key":"knittl89@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/2149217?v=4"},"body":"print more information in `git checkout -h` to stop people from\ncomplaining about git's help ;)\n\nhttp://repo.or.cz/w/git/dkf.git/commitdiff/95209979cb1a0de071a3cceac593fbb40235b926\n\ncheers, daniel\n\n-- \ntyped with http://neo-layout.org\nmyFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released!\n"},{"id":"151383","messageId":"AANLkTikjqW5R4p90T3pWACPG9vGqd4uRETiE-Wb_BybS@mail.gmail.com","threadId":"25153","inReplyTo":"AANLkTikra1iE5JpXvvPnNcwE=XEDF6B=ubCteEi77dqX@mail.gmail.com","subject":"Re: [PATCH] Improvements to `git checkout -h`","fromName":"Knittl","fromEmail":"knittl89@googlemail.com","sentAt":"2010-09-23T18:26:42Z","receivedAt":"2010-09-23T18:26:42Z","isPatch":true,"sender":{"key":"knittl89@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/2149217?v=4"},"body":"any thoughts on this one?\n\nOn Sun, Sep 19, 2010 at 9:41 PM, Knittl wrote:\n> print more information in `git checkout -h` to stop people from\n> complaining about git's help ;)\n>\n> http://repo.or.cz/w/git/dkf.git/commitdiff/95209979cb1a0de071a3cceac593fbb40235b926\n>\n> cheers, daniel\n>\n> --\n> typed with http://neo-layout.org\n> myFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released!\n>\n\n\n\n-- \ntyped with http://neo-layout.org\nmyFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released!\n"},{"id":"151389","messageId":"AANLkTi=LBzJWGuqtqJT1eUtmQqFTj8jixxB=hONTh+mi@mail.gmail.com","threadId":"25153","inReplyTo":"AANLkTikjqW5R4p90T3pWACPG9vGqd4uRETiE-Wb_BybS@mail.gmail.com","subject":"Re: [PATCH] Improvements to `git checkout -h`","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-23T20:05:03Z","receivedAt":"2010-09-23T20:05:03Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Thu, Sep 23, 2010 at 18:26, Knittl wrote:\n> any thoughts on this one?\n\nHi and thanks for patching Git, but could you please submit patches as\ndetailed in Documentation/SubmittingPatches ?\n"},{"id":"151394","messageId":"AANLkTinBoofjS=+ropQnHARn+qtzJWh2Nx6n87cud5Di@mail.gmail.com","threadId":"25153","inReplyTo":"AANLkTi=LBzJWGuqtqJT1eUtmQqFTj8jixxB=hONTh+mi@mail.gmail.com","subject":"Re: [PATCH] Improvements to `git checkout -h`","fromName":"Knittl","fromEmail":"knittl89@googlemail.com","sentAt":"2010-09-23T20:37:31Z","receivedAt":"2010-09-23T20:37:31Z","isPatch":true,"sender":{"key":"knittl89@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/2149217?v=4"},"body":"On Thu, Sep 23, 2010 at 10:05 PM, Ævar Arnfjörð Bjarmason\n wrote:\n> On Thu, Sep 23, 2010 at 18:26, Knittl wrote:\n>> any thoughts on this one?\n>\n> Hi and thanks for patching Git, but could you please submit patches as\n> detailed in Documentation/SubmittingPatches ?\n\nas i use gmail i thought i'd link to the patch, not to mess up\nwhitespace (still haven't got it working the correct way)\n\nanyways, here it goes inlined:\n\n-------8<---------\n\nFrom 15781ca9a67f406ec4d608b2e3eae2b129eb7c06 Mon Sep 17 00:00:00 2001\nFrom: Daniel Knittl-Frank \nDate: Sun, 19 Sep 2010 14:04:43 +0200\nSubject: [PATCH] Improvements to `git checkout -h`\n\nbe a little more verbose about what each option does\n\nSigned-off-by: Daniel Knittl-Frank \n---\n builtin/checkout.c | 12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex f2f355a..9240faf 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -691,16 +691,16 @@ int cmd_checkout(int argc, const char **argv,\nconst char *prefix)\n \t\t\t \"create and checkout a new branch\"),\n \t\tOPT_STRING('B', NULL, &opts.new_branch_force, \"branch\",\n \t\t\t \"create/reset and checkout a branch\"),\n-\t\tOPT_BOOLEAN('l', NULL, &opts.new_branch_log, \"log for new branch\"),\n-\t\tOPT_SET_INT('t', \"track\", &opts.track, \"track\",\n+\t\tOPT_BOOLEAN('l', NULL, &opts.new_branch_log, \"create reflog for new branch\"),\n+\t\tOPT_SET_INT('t', \"track\", &opts.track, \"set upstream info for new branch\",\n \t\t\tBRANCH_TRACK_EXPLICIT),\n \t\tOPT_STRING(0, \"orphan\", &opts.new_orphan_branch, \"new branch\", \"new\nunparented branch\"),\n-\t\tOPT_SET_INT('2', \"ours\", &opts.writeout_stage, \"stage\",\n+\t\tOPT_SET_INT('2', \"ours\", &opts.writeout_stage, \"checkout our\nversion for unmerged files\",\n \t\t\t 2),\n-\t\tOPT_SET_INT('3', \"theirs\", &opts.writeout_stage, \"stage\",\n+\t\tOPT_SET_INT('3', \"theirs\", &opts.writeout_stage, \"checkout their\nversion for unmerged files\",\n \t\t\t 3),\n-\t\tOPT_BOOLEAN('f', \"force\", &opts.force, \"force\"),\n-\t\tOPT_BOOLEAN('m', \"merge\", &opts.merge, \"merge\"),\n+\t\tOPT_BOOLEAN('f', \"force\", &opts.force, \"force checkout (throw away\nlocal modifications)\"),\n+\t\tOPT_BOOLEAN('m', \"merge\", &opts.merge, \"perform a 3-way merge with\nthe new branch\"),\n \t\tOPT_STRING(0, \"conflict\", &conflict_style, \"style\",\n \t\t\t \"conflict style (merge or diff3)\"),\n \t\tOPT_BOOLEAN('p', \"patch\", &patch_mode, \"select hunks interactively\"),\n-- \n1.7.3.235.g952099\n\n\n\n\n-- \ntyped with http://neo-layout.org\nmyFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released!\n"},{"id":"151398","messageId":"vpqk4mcuqxa.fsf@bauges.imag.fr","threadId":"25153","inReplyTo":"AANLkTinBoofjS=+ropQnHARn+qtzJWh2Nx6n87cud5Di@mail.gmail.com","subject":"Re: [PATCH] Improvements to `git checkout -h`","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-09-23T20:48:49Z","receivedAt":"2010-09-23T20:48:49Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Knittl writes:\n\n> as i use gmail i thought i'd link to the patch, not to mess up\n> whitespace (still haven't got it working the correct way)\n\nDoesn't the part on gmail in SubmittingPatches work for you?\n\nOtherwise, the patch sounds good.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"151508","messageId":"1285345319-6109-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"25153","inReplyTo":"AANLkTinBoofjS=+ropQnHARn+qtzJWh2Nx6n87cud5Di@mail.gmail.com","subject":"[PATCH] Improvements to `git checkout -h`","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2010-09-24T16:21:59Z","receivedAt":"2010-09-24T16:21:59Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"From: Daniel Knittl-Frank \n\nbe a little more verbose about what each option does\n\nSigned-off-by: Daniel Knittl-Frank \n---\nDaniel seems to have difficulty to send the patch through gmail, here\nit is again, taken from repo.or.cz.\n\nThat seems OK for inclusion to me.\n\n builtin/checkout.c | 12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 560eae1..a54583b 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -691,16 +691,16 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\t\t \"create and checkout a new branch\"),\n \t\tOPT_STRING('B', NULL, &opts.new_branch_force, \"branch\",\n \t\t\t \"create/reset and checkout a branch\"),\n-\t\tOPT_BOOLEAN('l', NULL, &opts.new_branch_log, \"log for new branch\"),\n-\t\tOPT_SET_INT('t', \"track\", &opts.track, \"track\",\n+\t\tOPT_BOOLEAN('l', NULL, &opts.new_branch_log, \"create reflog for new branch\"),\n+\t\tOPT_SET_INT('t', \"track\", &opts.track, \"set upstream info for new branch\",\n \t\t\tBRANCH_TRACK_EXPLICIT),\n \t\tOPT_STRING(0, \"orphan\", &opts.new_orphan_branch, \"new branch\", \"new unparented branch\"),\n-\t\tOPT_SET_INT('2', \"ours\", &opts.writeout_stage, \"stage\",\n+\t\tOPT_SET_INT('2', \"ours\", &opts.writeout_stage, \"checkout our version for unmerged files\",\n \t\t\t 2),\n-\t\tOPT_SET_INT('3', \"theirs\", &opts.writeout_stage, \"stage\",\n+\t\tOPT_SET_INT('3', \"theirs\", &opts.writeout_stage, \"checkout their version for unmerged files\",\n \t\t\t 3),\n-\t\tOPT_BOOLEAN('f', \"force\", &opts.force, \"force\"),\n-\t\tOPT_BOOLEAN('m', \"merge\", &opts.merge, \"merge\"),\n+\t\tOPT_BOOLEAN('f', \"force\", &opts.force, \"force checkout (throw away local modifications)\"),\n+\t\tOPT_BOOLEAN('m', \"merge\", &opts.merge, \"perform a 3-way merge with the new branch\"),\n \t\tOPT_STRING(0, \"conflict\", &conflict_style, \"style\",\n \t\t\t \"conflict style (merge or diff3)\"),\n \t\tOPT_BOOLEAN('p', \"patch\", &patch_mode, \"select hunks interactively\"),\n-- \n1.7.3.2.g257b5f\n"},{"id":"151849","messageId":"7vy6anysvv.fsf@alter.siamese.dyndns.org","threadId":"25153","inReplyTo":"1285345319-6109-1-git-send-email-Matthieu.Moy@imag.fr","subject":"Re: [PATCH] Improvements to `git checkout -h`","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-09-27T17:54:12Z","receivedAt":"2010-09-27T17:54:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> From: Daniel Knittl-Frank \n>\n> be a little more verbose about what each option does\n>\n> Signed-off-by: Daniel Knittl-Frank \n> ---\n> Daniel seems to have difficulty to send the patch through gmail, here\n> it is again, taken from repo.or.cz.\n>\n> That seems OK for inclusion to me.\n\nThanks.\n"}]}