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

Re: [PATCH 1/3] rebase -i: handle --continue more like non-interactive rebase

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 8, 2007, 04:40 UTC
Message-ID
<Pine.LNX.4.64.0707080537490.4093@racer.site>
In-Reply-To
<Pine.LNX.4.64.0707080300440.4093@racer.site>
Hi,
On Sun, 8 Jul 2007, Johannes Schindelin wrote:
Show 19 quoted lines
> 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

Previous: Johannes SchindelinNext: Alex Riesen
Message 2 of 9 in “rebase -i: handle --continue more like non-interactive rebase”
  1. 1/3 rebase -i: handle --continue more like non-interactive rebaseJohannes Schindelin, Jul 8, 2007
  2. Johannes SchindelinJul 8, 2007
  3. Alex RiesenJul 12, 2007
  4. Johannes SchindelinAug 1, 2007
  5. Alex RiesenAug 1, 2007
  6. rebase -i: fix for optional [branch] parameterJohannes Schindelin, Aug 1, 2007
  7. Fix rebase interactive to allow specifying branch to rebase along with the baseAlex Riesen, Aug 1, 2007
  8. Johannes SchindelinAug 1, 2007
  9. Alex RiesenAug 1, 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.