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

Re: [PATCH] Mod. gitk to support REBASE (with stash support).

From
PBPeter Baumann <waste.manager@gmx.de>
Date
Aug 8, 2007, 19:31 UTC
Message-ID
<20070808193130.GC27470@xp.machine.xx>
In-Reply-To
<1186598028457-git-send-email-alexandre.bourget@savoirfairelinux.com>
On Wed, Aug 08, 2007 at 02:33:48PM -0400, Alexandre Bourget wrote:
Show 7 quoted lines
> ---
> Adds a context menu for commits, so that a 'rebase' can be done.
> 
> Optionally, it will ask if you want to 'stash' current work before doing so.
> 
> TODO: better error handling.
> 
[...long patch ...]
Show 5 quoted lines
> +    # TODO: error handling.
> +    exec git rebase $id
> +
> +    if {$confirm_ok} {
> +	exec git stash apply stash@{0}
'git stash apply' could fail with merge conflicts ...
> +	exec git stash clear
and here you are throwing the stash away!
Show 5 quoted lines
> +    }
> +
> +    notbusy rebasehead
> +    updatecommits
> +}
-Peter
Previous: Alexandre BourgetNext: Johannes Schindelin
Message 2 of 10 in “Mod. gitk to support REBASE (with stash support).”
  1. Mod. gitk to support REBASE (with stash support).Alexandre Bourget, Aug 8, 2007
  2. Peter BaumannAug 8, 2007
  3. Johannes SchindelinAug 8, 2007
  4. David KastrupAug 8, 2007
  5. Shawn O. PearceAug 9, 2007
  6. David KastrupAug 9, 2007
  7. Shawn O. PearceAug 9, 2007
  8. Shawn O. PearceAug 9, 2007
  9. David KastrupAug 9, 2007
  10. Junio C HamanoAug 8, 2007

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.