Hi, On Sat, 1 Sep 2007, Shawn O. Pearce wrote: > Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Robin Rosenberg <robin.rosenberg@xxxxxxxxxx> writes: > > > > > > + local g="$(git rev-parse --git-dir 2>/dev/null)" > > > + if [ -n "$g" ]; then > > > + local r > > > + local b > > > + if [ -d "$g/../.dotest" ] > > > + then > > > + local b="$(git symbolic-ref HEAD 2>/dev/null)" > > > + r="|REBASEING" > > > > 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/. And interactive rebase is detectable by the "interactive" file in .git/.dotest-merge/. Ciao, Dscho - 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
