From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 1/3] rebase -i: handle --continue more like non-interactive rebase
Date: Sun, 8 Jul 2007 05:40:53 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0707080537490.4093@racer.site> (raw)
In-Reply-To: <Pine.LNX.4.64.0707080300440.4093@racer.site>
Hi,
On Sun, 8 Jul 2007, Johannes Schindelin wrote:
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 0c2a969..67f2ee2 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
>
> [...]
>
> @@ -265,6 +264,14 @@ do
>
> test -d "$DOTEST" || die "No interactive rebase running"
>
> + # commit if necessary
> + git rev-parse --verify HEAD > /dev/null &&
> + git update-index --refresh &&
> + git diff-files --quiet &&
> + ! git diff-index --cached --quiet HEAD &&
> + . "$DOTEST"/author-script &&
> + git commit -F "$DOTEST"/message -e
> +
Oh well. For this to work, there has to be a line
export GIT_AUTHOR_NAME GIT_AUTHOR_NAME GIT_AUTHOR_DATE &&
before the "git commit" line, I think.
Ciao,
Dscho
next prev parent reply other threads:[~2007-07-08 4:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-08 2:01 [PATCH 1/3] rebase -i: handle --continue more like non-interactive rebase Johannes Schindelin
2007-07-08 4:40 ` Johannes Schindelin [this message]
2007-07-12 22:26 ` Alex Riesen
2007-08-01 15:57 ` Johannes Schindelin
2007-08-01 21:45 ` Alex Riesen
2007-08-01 22:31 ` [PATCH] rebase -i: fix for optional [branch] parameter Johannes Schindelin
2007-08-01 22:32 ` [PATCH] Fix rebase interactive to allow specifying branch to rebase along with the base Alex Riesen
2007-08-01 22:36 ` Johannes Schindelin
2007-08-01 22:40 ` Alex Riesen
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=Pine.LNX.4.64.0707080537490.4093@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).