Re: [PATCH 4/6] Documentation: emphasize when git merge terminates early

From: Thomas Rast <trast@student.ethz.ch>
Date: Jan 11, 2010, 23:11 UTC
Message-ID: <201001120011.38704.trast@student.ethz.ch>
In-Reply-To: <20100111083754.GD23806@progeny.tock>

Jonathan Nieder wrote:

Show 5 quoted lines

> +In some other version control systems, you merge/update and then
> +commit, with the risk of clobbering your changes with humongous
> +conflicts. You shouldn't be pulling or merging if you haven't got
> +your own work into good shape and committed it locally (see also
> +linkgit:git-stash[1]).

Isn't it wrong to talk about other VCS, especially when writing down what Git does *not*? The user wants to know what git *does*, otherwise he wouldn't be looking in the manual.

> +If all named commits are already ancestors of `HEAD`, 'git merge'
> +will exit early with the message "Already up-to-date."

<aside> I suspect this is little-known but the equivalent message for an octopus is actually: "Already up-to-date. Yeeah!" </aside>

-- 
Thomas Rast
trast@{inf,student}.ethz.ch