Hello,
even though git-rebase -i is still young, I'm already a big fan of it.
I just want to suggest two minor things:
- If a cherry-pick fails, it tells me to resolve my conflicts, 'git add

  <paths>' and to do 'git commit -c $sha1id'.
  But it doesn't tell me, how I continue to rebase after that.
  'git rebase -i --continue' works.
- If a cherry-pick of a commit to be squashed fails, the instruction to

  do 'git commit -c $sha1id' is wrong, because then I don't get both

  message to squash.
Best regards

Uwe
--

Uwe Kleine-K

Hi,
Actually, even "git rebase --continue" works.  And you do not really have

to commit, either, just updating your index is fine.  In fact, if you say 
Yes, it is a leftover from the bad old days, when this script was called

edit-patch-series, and I was a rebase hater.
In the meantime, somebody on IRC explained to me how rebase works, and

that rebase lovers were quite annoyed not to be able to just resolve the

conflicts and "git rebase --continue".
I'd appreciate if you prepared a patch with better explanations, and also

reviewed the man page, if it is in good shape (and does not lie about the

current behaviour).
Thanks,

Dscho
-

Hello Johannes,
It's on my todo list, but not the top item for git.
In the mean-time I found another nuisance:
After doing:
	tmpdir=/tmp/repo

	mkdir $tmpdir

	cd $tmpdir

	git init

	for n in one two three four; do echo $n >> file; git add file;

	git commit -m $n; done

	git rebase -i HEAD~3 #squash four onto two
git rebase stops (as expected) when trying to apply four, at this stage

two is already commited.
The conflicting file looks as follows:
	one

	two

	<<<<<<< HEAD:file

	=======

	three

	four

	>>>>>>> e7fbd8f... four:file
I currently have no idea how to improve this, but I miss the information

that the commit *adds* "four" and "three" is only context.
Resolving with:
	echo one > file; echo two >> file; echo four >> file;

	git add file; git rebase --continue
and typing a new log (e.g. two + four) git rebase stops once more (again

as expected) when trying to apply three, OK, resolving the conflict is

easy (one, two, three, four), git add file, git rebase --continue.
Looking at the resulting log, I have the following:
        zeisberg@cassiopeia:/tmp/repo$ git log --pretty=oneline

	145ce01e1cf3f4cb86cd0065c0d0d5b62b399ad4 three

	cd082bca636efca17409be4d871d0971237df06c two + four

	b6b985977db45e314509d94282597c2ff8029d3d two

	15f8cbbb5a452b075b49f3dedbeaeb66668b8025 one
So the request to squash two + four was lost.
I will look at it when I'm done with git-sendemail ...
Best regards

Uwe
--

Uwe Kleine-K

When a squashing merge failed, the first commit would not be replaced,

due to "git reset --soft" being called with an unmerged index.
Noticed by Uwe Kleine-König.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

---
	On Tue, 24 Jul 2007, Uwe Kleine-K?nig wrote:
	> Johannes Schindelin wrote:

	>

	> > I'd appreciate if you prepared a patch with better

	> > explanations, and also reviewed the man page, if it is in good

	> > shape (and does not lie about the current behaviour).

	>

	> It's on my todo list, but not the top item for git.
	Please come around to do it.
	> In the mean-time I found another nuisance:

	>

	> [outlines the test case provided in this patch]
	It would have been a bit less work for me, if you would have used

	t/trash/ instead of /tmp/, and provided a patch for t3404 for me

	to work with.
	Alas, the bug was squashed in 5 minutes.  It took me 15 minutes to

	write (and test) the test.
	What a difference order can make...
 git-rebase--interactive.sh    |    2 +-

 t/t3404-rebase-interactive.sh |   30 ++++++++++++++++++++++++++++++

 2 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh

index 93289c0..78ae51e 100755

--- a/git-rebase--interactive.sh

+++ b/git-rebase--interactive.sh

@@ -258,8 +258,8 @@ do_next () {

 		esac
 		failed=f

-		pick_one -n $sha1 || failed=t

 		output git reset --soft HEAD^

+		pick_one -n $sha1 || failed=t

 		author_script=$(get_author_ident_from_commit $sha1)

 		echo "$author_script" > "$DOTEST"/author-script

 		case $failed in

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh

index 8206436..817f614 100755

--- a/t/t3404-rebase-interactive.sh

+++ b/t/t3404-rebase-interactive.sh

@@ -221,4 +221,34 @@ test_expect_success 'multi-squash only fires up editor once' '

 	test 1 = $(git show | grep ONCE | wc -l)

 '
+test_expect_success 'squash works as expecte...
[ message continues ]

Hi,
Unfortunately, no Ack from him.
However, I have tested it myself (even unwantedly, when working on the

work-tree sanitising, and it bit me again; I run

"master"+branch--new-workdir ATM).
Junio, please apply...
Ciao,

Dscho