Re: A documentation to-do list

On Wednesday 22 November 2006 01:13, Chris Riddoch wrote:
> Hi, everyone.
>
> Having decided to take it on myself to improve Git's documentation, I
> asked on #git if people had particular things they felt I should focus
> on.  I also was prompted to put up a page on the wiki to make my to-do
> list public.
>
> So, I present:  http://git.or.cz/gitwiki/Documentation_To-Do_List
>
> Add your favorite, specific, lack-of-documentation or badly-described
> annoyance here!

Timely, although I will ask the question here rather than there.

I have started to use git-rebase a lot to try and sort out a project that has 
got lots of long chains of commits on parallel branches doing roughly the 
same thing.  But I do not understand what the --merge flag is about.

git-rebase is clearly doing some form of merge for every commit it moves 
without the  --merge flag, so what does it add?

I thought I understood merging, but clearly I don't.

-- 
Alan Chandler
http://www.chandlerfamily.org.uk
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html