On Mon, Sep 13, 2010 at 4:06 AM, Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> wrote: > First of all: I've been out of the loop last week, so please forgive me if this > comes at the wrong phase of a cycle. > > I portioned the changes to git-reset.txt and ordered them starting from the > least controversial, I hope. The descriptions of modes have grown organically > over time, and this series tries to make them consistent in structure and > wording, after cleaning up some minor issues. 6/6 is the "meat", so to say. > > For the "--merge" description in 6/6: Please double check. I've tried to > understand the mode from the tables and from the inner works (git read-tre -u -m > plus carrying over unmerged entries) because I did not understand the original > description. My quick read of these changes is that, all around, they are a big improvement to what I find to be one of git's most confusing man pages. j. -- 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