From: Peter Baumann <waste.manager@gmx.de>
To: Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>
Cc: Git Mailing List <git@vger.kernel.org>, paulus@samba.org
Subject: Re: [PATCH] Mod. gitk to support REBASE (with stash support).
Date: Wed, 8 Aug 2007 21:31:30 +0200 [thread overview]
Message-ID: <20070808193130.GC27470@xp.machine.xx> (raw)
In-Reply-To: <1186598028457-git-send-email-alexandre.bourget@savoirfairelinux.com>
On Wed, Aug 08, 2007 at 02:33:48PM -0400, Alexandre Bourget wrote:
> ---
> 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 ...]
> + # 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!
> + }
> +
> + notbusy rebasehead
> + updatecommits
> +}
-Peter
next prev parent reply other threads:[~2007-08-08 19:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-08 18:33 [PATCH] Mod. gitk to support REBASE (with stash support) Alexandre Bourget
2007-08-08 19:31 ` Peter Baumann [this message]
2007-08-08 19:42 ` Johannes Schindelin
2007-08-08 20:08 ` David Kastrup
2007-08-09 3:26 ` Shawn O. Pearce
2007-08-09 5:51 ` David Kastrup
2007-08-09 6:58 ` Shawn O. Pearce
2007-08-09 7:21 ` Shawn O. Pearce
2007-08-09 7:55 ` David Kastrup
2007-08-08 19:53 ` Junio C Hamano
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=20070808193130.GC27470@xp.machine.xx \
--to=waste.manager@gmx.de \
--cc=alexandre.bourget@savoirfairelinux.com \
--cc=git@vger.kernel.org \
--cc=paulus@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox