Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > On Sat, 1 Sep 2007, Shawn O. Pearce wrote: > > Junio C Hamano <gitster@xxxxxxxxx> wrote: > > > > > > I might be in the middle of resolving a conflicted "git am". > > > > And there's no way to tell the difference either. > > AFAICT git-am creates an "info" file in .dotest/. But git-rebase without -m and -i is defined as format-patch|am. So when rebasing it looks identical to git-am. Hence no way to tell the difference between the two. I think post 1.5.3 one of the things we should work on is trying to better track our current operation state. Most of that would be to refactor how we track state in things like rebase/am/merge. -- Shawn. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
