All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: qgit idea: interface for cherry-picking
Date: Mon, 03 Jul 2006 00:54:39 +0200	[thread overview]
Message-ID: <e89iql$42a$1@sea.gmane.org> (raw)
In-Reply-To: e5bfff550607021504l6e7fc8b8ja61f20f630c0f3f@mail.gmail.com

Marco Costalba wrote:

> What do you think about this:
> 
> When dropping the selected commits, instead of creating new commits,
> appears a message box with something like "Do you want to apply the
> commits on top of your current branch or on your working directory?"
> 
> Sounds good for you? Or you still prefer the context menu?
> In the latter case, if I have understood correctly, you are limited to
> cherry-pick among branches and/or working directory of the _same_
> repository.

Yes, git-cherry-pick works only between commits in the same repository,
as it use merge (first "simple", i.e. git-read-tree -m -u --aggresive, if
fails tries "automatic" i.e. git-merge-index -o git-merge-one-file -a, then
git-write-tree), as opposed to git-format-patch and git-am or git-apply,
which can work across repositories.

What I really want is "no-commit" of drag'n'dropped, or exported and applied
commits/patches (although interface to cherry-pick would be nice, even if
cherry-pick is limited), so I'd like message box with "Do you want to
commit selected patches?" when dropping commits, or something like that.
Unfortunately git-am doesn't have --no-commit flag, but one could emulate it
with git-reset after git-am a patch, I think.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git

  reply	other threads:[~2006-07-02 22:54 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-07-02 19:01 qgit idea: interface for cherry-picking Jakub Narebski
2006-07-02 21:33 ` Marco Costalba
2006-07-02 21:46   ` Jakub Narebski
2006-07-02 22:04     ` Marco Costalba
2006-07-02 22:54       ` Jakub Narebski [this message]
2006-07-03  5:45         ` Marco Costalba
2006-07-03  6:42           ` Junio C Hamano
2006-07-03 11:18             ` Marco Costalba
2006-07-03 20:03               ` Junio C Hamano
2006-07-04  6:22                 ` Marco Costalba
2006-07-04  6:39                   ` Jakub Narebski
2006-07-04 11:58                     ` Marco Costalba
2006-07-04 13:29                       ` Jakub Narebski
2006-07-04 18:38                         ` Marco Costalba
2006-07-04  6:41                   ` Junio C Hamano
2006-07-04  7:02                     ` Jakub Narebski
2006-07-04 11:21                     ` Marco Costalba
2006-07-04 18:23                       ` Marco Costalba

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='e89iql$42a$1@sea.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.