git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: qgit idea: interface for cherry-picking

From
MCMarco Costalba <mcostalba@gmail.com>
Date
Jul 3, 2006, 05:45 UTC
Message-ID
<e5bfff550607022245s2ef160fu5ad30a822f06117d@mail.gmail.com>
In-Reply-To
<e89iql$42a$1@sea.gmane.org>
On 7/3/06, Jakub Narebski <jnareb@gmail.com> wrote:
Show 26 quoted lines
> 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.
>

When I need to modify the patch/revision before to import I usaually drag&drop and then I call git-reset --soft, then I edit working directory and commit again.

Perhaps I can automate this in case the user answers "No, apply to working dir only" to the message box.

Is it the correct way to go or is better to wait for a --no-commit flag in git-am? Junio?

   Thanks
   Marco
Previous: Jakub NarebskiNext: Junio C Hamano
Message 6 of 18 in “qgit idea: interface for cherry-picking”
  1. Jakub NarebskiJul 2, 2006
  2. Marco CostalbaJul 2, 2006
  3. Jakub NarebskiJul 2, 2006
  4. Marco CostalbaJul 2, 2006
  5. Jakub NarebskiJul 2, 2006
  6. Marco CostalbaJul 3, 2006
  7. Junio C HamanoJul 3, 2006
  8. Marco CostalbaJul 3, 2006
  9. Junio C HamanoJul 3, 2006
  10. Marco CostalbaJul 4, 2006
  11. Jakub NarebskiJul 4, 2006
  12. Marco CostalbaJul 4, 2006
  13. Jakub NarebskiJul 4, 2006
  14. Marco CostalbaJul 4, 2006
  15. Junio C HamanoJul 4, 2006
  16. Jakub NarebskiJul 4, 2006
  17. Marco CostalbaJul 4, 2006
  18. Marco CostalbaJul 4, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.