git bisect with temporary commits

Hi! Today I bisected a bug which required cherry-picking an (unrelated) compile fix later in the history so I could test the commits. After testing a commit, I didn't reset to the commit before the cherry-picked one, which seemed to work well, but doesn't in my minimal example: $ git init

Re: git bisect with temporary commits

* Junio C Hamano <gits...@pobox.com> [2015-12-14 11:21:06 -0800]: > Florian Bruhin <m...@the-compiler.org> writes: > > > * Andreas Schwab <sch...@linux-m68k.org> [2015-12-14 19:08:48 +0100]: > >> Florian Bruhin <m...@the-compiler.org> writes:

Re: git bisect with temporary commits

* Andreas Schwab <sch...@linux-m68k.org> [2015-12-14 19:08:48 +0100]: > Florian Bruhin <m...@the-compiler.org> writes: > > > Now when trying to say it's good (and forgetting to remove the > > temporary commits), I get this: > > > > $ git bisect

[BUG?] git-revert ignores --no-commit on conflicts

Hi, I found something which seems to be a bug to me (or well, maybe I'm doing something wrong...). When I revert a commit with -n/--no-commit and there's a conflict, when doing git revert --continue I get an editor, even though I wouldn't expect that to happen. Example: $ git init