git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Wincent Colaiuta <win@wincent.com>
Cc: Benoit Sigoure <tsuna@lrde.epita.fr>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: Rebase/cherry-picking idea
Date: Mon, 26 Nov 2007 13:51:02 +0100	[thread overview]
Message-ID: <474AC136.8060906@viscovery.net> (raw)
In-Reply-To: <CDF48716-F198-4B33-A5F5-8A2DE1F177EB@wincent.com>

Wincent Colaiuta schrieb:
> El 26/11/2007, a las 12:27, Wincent Colaiuta escribió:
>> So I think that misleading noise needs to be suppressed or reworded 
>> when rebasing. Will look into it.
> 
> How about something like this? It would obviously be nice if we could 
> avoid adding another option to builtin-revert; perhaps when/if 
> git-rebase becomes a builtin we can avoid that. The other alternative, 
> and probably one I like I bit more, would be to auto-detect that a 
> rebase is in progress by looking inside the GIT_DIR, although that would 
> also alter the behaviour of manual invocations of git-revert and 
> git-cherry-pick during an interactive rebase (do people actually do 
> that?). What do you think?

Introduce an environment variable _GIT_CHERRY_PICK_HELP (note the leading 
underscore), which git-rebase sets; if it's set, git-cherry-pick uses that 
text instead of the usual one.

-- Hannes

  parent reply	other threads:[~2007-11-26 12:51 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-26  9:02 Rebase/cherry-picking idea Wincent Colaiuta
2007-11-26  9:32 ` Benoit Sigoure
2007-11-26 11:27   ` Wincent Colaiuta
2007-11-26 12:34     ` Wincent Colaiuta
2007-11-26 12:39       ` Benoit Sigoure
2007-11-26 12:51       ` Johannes Sixt [this message]
2007-11-26 13:15         ` Wincent Colaiuta
2007-11-26 13:41           ` Johannes Schindelin
2007-11-26 13:55             ` Wincent Colaiuta
2007-11-28  8:06               ` Junio C Hamano
2007-11-28  8:52                 ` Wincent Colaiuta
2007-11-28  9:47                   ` Junio C Hamano
2007-11-28 10:04                     ` Wincent Colaiuta
2007-11-28 13:57                       ` [PATCH] Replace instances of export VAR=VAL with VAR=VAL; export VAR Johannes Schindelin
2007-11-28 14:09                         ` David Kastrup
2007-11-28 14:19                         ` Nguyen Thai Ngoc Duy
2007-11-28 14:24                           ` David Kastrup
2007-11-28 14:27                             ` Nguyen Thai Ngoc Duy
2007-11-28 14:36                               ` Johannes Schindelin
2007-11-28 14:27                           ` Johannes Schindelin
2007-11-28 14:21                         ` Johannes Sixt
2007-11-28 14:29                           ` Johannes Schindelin
2007-11-28 14:39                             ` Johannes Sixt
2007-11-28 15:56                               ` [PATCH v2] " Johannes Schindelin
2007-11-28 16:03                                 ` David Kastrup
2007-11-28 22:46                                   ` Junio C Hamano
2007-11-28 22:53                                     ` David Kastrup
2007-11-28 23:02                                       ` Jeff King
2007-11-28 23:10                                         ` David Kastrup
2007-11-29  7:39                                       ` Johannes Sixt
2007-11-29 10:17                                         ` David Kastrup
2007-11-28 23:05                                     ` Johannes Schindelin
2007-11-28 18:49                               ` [PATCH] " Junio C Hamano
2007-11-28 19:03                                 ` Johannes Schindelin
2007-11-28 22:48                                   ` Junio C Hamano
2007-11-28 23:08                                     ` Johannes Schindelin
2007-11-28 14:41                             ` David Kastrup
2007-11-28 18:44                       ` Rebase/cherry-picking idea Junio C Hamano
2007-11-26 17:26         ` Junio C Hamano
2007-11-26 19:12           ` Marco Costalba
2007-11-27  1:08           ` Shawn O. Pearce
2007-11-27  1:25             ` Junio C Hamano
2007-11-26 13:26   ` Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=474AC136.8060906@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=tsuna@lrde.epita.fr \
    --cc=win@wincent.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).