* [PATCH] Improvements to `git checkout -h` @ 2010-09-19 19:41 Knittl 2010-09-23 18:26 ` Knittl 0 siblings, 1 reply; 7+ messages in thread From: Knittl @ 2010-09-19 19:41 UTC (permalink / raw) To: git print more information in `git checkout -h` to stop people from complaining about git's help ;) http://repo.or.cz/w/git/dkf.git/commitdiff/95209979cb1a0de071a3cceac593fbb40235b926 cheers, daniel -- typed with http://neo-layout.org myFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released! ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Improvements to `git checkout -h` 2010-09-19 19:41 [PATCH] Improvements to `git checkout -h` Knittl @ 2010-09-23 18:26 ` Knittl 2010-09-23 20:05 ` Ævar Arnfjörð Bjarmason 0 siblings, 1 reply; 7+ messages in thread From: Knittl @ 2010-09-23 18:26 UTC (permalink / raw) To: git any thoughts on this one? On Sun, Sep 19, 2010 at 9:41 PM, Knittl <knittl89@googlemail.com> wrote: > print more information in `git checkout -h` to stop people from > complaining about git's help ;) > > http://repo.or.cz/w/git/dkf.git/commitdiff/95209979cb1a0de071a3cceac593fbb40235b926 > > cheers, daniel > > -- > typed with http://neo-layout.org > myFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released! > -- typed with http://neo-layout.org myFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released! ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Improvements to `git checkout -h` 2010-09-23 18:26 ` Knittl @ 2010-09-23 20:05 ` Ævar Arnfjörð Bjarmason 2010-09-23 20:37 ` Knittl 0 siblings, 1 reply; 7+ messages in thread From: Ævar Arnfjörð Bjarmason @ 2010-09-23 20:05 UTC (permalink / raw) To: Knittl; +Cc: git On Thu, Sep 23, 2010 at 18:26, Knittl <knittl89@googlemail.com> wrote: > any thoughts on this one? Hi and thanks for patching Git, but could you please submit patches as detailed in Documentation/SubmittingPatches ? ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Improvements to `git checkout -h` 2010-09-23 20:05 ` Ævar Arnfjörð Bjarmason @ 2010-09-23 20:37 ` Knittl 2010-09-23 20:48 ` Matthieu Moy 2010-09-24 16:21 ` Matthieu Moy 0 siblings, 2 replies; 7+ messages in thread From: Knittl @ 2010-09-23 20:37 UTC (permalink / raw) To: Ævar Arnfjörð Bjarmason; +Cc: git On Thu, Sep 23, 2010 at 10:05 PM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote: > On Thu, Sep 23, 2010 at 18:26, Knittl <knittl89@googlemail.com> wrote: >> any thoughts on this one? > > Hi and thanks for patching Git, but could you please submit patches as > detailed in Documentation/SubmittingPatches ? as i use gmail i thought i'd link to the patch, not to mess up whitespace (still haven't got it working the correct way) anyways, here it goes inlined: -------8<--------- From 15781ca9a67f406ec4d608b2e3eae2b129eb7c06 Mon Sep 17 00:00:00 2001 From: Daniel Knittl-Frank <knittl89+git@googlemail.com> Date: Sun, 19 Sep 2010 14:04:43 +0200 Subject: [PATCH] Improvements to `git checkout -h` be a little more verbose about what each option does Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> --- builtin/checkout.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index f2f355a..9240faf 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -691,16 +691,16 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) "create and checkout a new branch"), OPT_STRING('B', NULL, &opts.new_branch_force, "branch", "create/reset and checkout a branch"), - OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"), - OPT_SET_INT('t', "track", &opts.track, "track", + OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "create reflog for new branch"), + OPT_SET_INT('t', "track", &opts.track, "set upstream info for new branch", BRANCH_TRACK_EXPLICIT), OPT_STRING(0, "orphan", &opts.new_orphan_branch, "new branch", "new unparented branch"), - OPT_SET_INT('2', "ours", &opts.writeout_stage, "stage", + OPT_SET_INT('2', "ours", &opts.writeout_stage, "checkout our version for unmerged files", 2), - OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage", + OPT_SET_INT('3', "theirs", &opts.writeout_stage, "checkout their version for unmerged files", 3), - OPT_BOOLEAN('f', "force", &opts.force, "force"), - OPT_BOOLEAN('m', "merge", &opts.merge, "merge"), + OPT_BOOLEAN('f', "force", &opts.force, "force checkout (throw away local modifications)"), + OPT_BOOLEAN('m', "merge", &opts.merge, "perform a 3-way merge with the new branch"), OPT_STRING(0, "conflict", &conflict_style, "style", "conflict style (merge or diff3)"), OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"), -- 1.7.3.235.g952099 -- typed with http://neo-layout.org myFtPhp -- visit http://myftphp.sf.net -- v. 0.4.7 released! ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Improvements to `git checkout -h` 2010-09-23 20:37 ` Knittl @ 2010-09-23 20:48 ` Matthieu Moy 2010-09-24 16:21 ` Matthieu Moy 1 sibling, 0 replies; 7+ messages in thread From: Matthieu Moy @ 2010-09-23 20:48 UTC (permalink / raw) To: Knittl; +Cc: Ævar Arnfjörð Bjarmason, git Knittl <knittl89@googlemail.com> writes: > as i use gmail i thought i'd link to the patch, not to mess up > whitespace (still haven't got it working the correct way) Doesn't the part on gmail in SubmittingPatches work for you? Otherwise, the patch sounds good. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Improvements to `git checkout -h` 2010-09-23 20:37 ` Knittl 2010-09-23 20:48 ` Matthieu Moy @ 2010-09-24 16:21 ` Matthieu Moy 2010-09-27 17:54 ` Junio C Hamano 1 sibling, 1 reply; 7+ messages in thread From: Matthieu Moy @ 2010-09-24 16:21 UTC (permalink / raw) To: git, gitster; +Cc: Daniel Knittl-Frank From: Daniel Knittl-Frank <knittl89+git@googlemail.com> be a little more verbose about what each option does Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> --- Daniel seems to have difficulty to send the patch through gmail, here it is again, taken from repo.or.cz. That seems OK for inclusion to me. builtin/checkout.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 560eae1..a54583b 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -691,16 +691,16 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) "create and checkout a new branch"), OPT_STRING('B', NULL, &opts.new_branch_force, "branch", "create/reset and checkout a branch"), - OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "log for new branch"), - OPT_SET_INT('t', "track", &opts.track, "track", + OPT_BOOLEAN('l', NULL, &opts.new_branch_log, "create reflog for new branch"), + OPT_SET_INT('t', "track", &opts.track, "set upstream info for new branch", BRANCH_TRACK_EXPLICIT), OPT_STRING(0, "orphan", &opts.new_orphan_branch, "new branch", "new unparented branch"), - OPT_SET_INT('2', "ours", &opts.writeout_stage, "stage", + OPT_SET_INT('2', "ours", &opts.writeout_stage, "checkout our version for unmerged files", 2), - OPT_SET_INT('3', "theirs", &opts.writeout_stage, "stage", + OPT_SET_INT('3', "theirs", &opts.writeout_stage, "checkout their version for unmerged files", 3), - OPT_BOOLEAN('f', "force", &opts.force, "force"), - OPT_BOOLEAN('m', "merge", &opts.merge, "merge"), + OPT_BOOLEAN('f', "force", &opts.force, "force checkout (throw away local modifications)"), + OPT_BOOLEAN('m', "merge", &opts.merge, "perform a 3-way merge with the new branch"), OPT_STRING(0, "conflict", &conflict_style, "style", "conflict style (merge or diff3)"), OPT_BOOLEAN('p', "patch", &patch_mode, "select hunks interactively"), -- 1.7.3.2.g257b5f ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Improvements to `git checkout -h` 2010-09-24 16:21 ` Matthieu Moy @ 2010-09-27 17:54 ` Junio C Hamano 0 siblings, 0 replies; 7+ messages in thread From: Junio C Hamano @ 2010-09-27 17:54 UTC (permalink / raw) To: Matthieu Moy; +Cc: git, gitster, Daniel Knittl-Frank Matthieu Moy <Matthieu.Moy@imag.fr> writes: > From: Daniel Knittl-Frank <knittl89+git@googlemail.com> > > be a little more verbose about what each option does > > Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> > --- > Daniel seems to have difficulty to send the patch through gmail, here > it is again, taken from repo.or.cz. > > That seems OK for inclusion to me. Thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-09-27 17:54 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-09-19 19:41 [PATCH] Improvements to `git checkout -h` Knittl 2010-09-23 18:26 ` Knittl 2010-09-23 20:05 ` Ævar Arnfjörð Bjarmason 2010-09-23 20:37 ` Knittl 2010-09-23 20:48 ` Matthieu Moy 2010-09-24 16:21 ` Matthieu Moy 2010-09-27 17:54 ` Junio C Hamano
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).