Patrick Welche <> writes:

> I just upgraded (via pkgsrc) from git to 1.8.4. With 1.8.4, I had
> local changes in glib, did a git pull --rebase. Some of my changes
> conflicted, but
> $ git rebase --abort
> No rebase in progress?
> so somehow the usual process of amending the edit, or skipping the patch
> no longer works.
> I found a similar report at:

Does the following patch fix this issue?

Matthieu Moy
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to