On Fri, Nov 6, 2009 at 12:53 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > If you do not have to have your extra "without affecting the index" > constraint (which I do not see a sensible reason to want to, by the way), > you can "merge --no-commit that_branch", I think. > After bouncing this around a couple of times with Bruce Stephens, and only now noticing that I hit "Reply" instead of "Reply-All"... sigh), I realized that what I wanted was: $ git merge --squash that_branch $ git reset I only wanted to affect my working copy, editing and adding things to the index (which I think of as "staging area for my next commit") as I was ready. --wpd -- 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