Re: A documentation to-do list

From: Alan Chandler <alan@chandlerfamily.org.uk>
Date: Nov 22, 2006, 05:29 UTC
Message-ID: <200611220529.18568.alan@chandlerfamily.org.uk>
In-Reply-To: <6efbd9b70611211713y4a1574adje48622f7bab6d702@mail.gmail.com>

On Wednesday 22 November 2006 01:13, Chris Riddoch wrote:

Show 11 quoted lines

> 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