From: Johannes Schindelin Date: Tue, 21 Nov 2006 09:19:59 GMT Subject: Re: Feature request: git-pull -e/--edit Message-ID: In-Reply-To: <4561FDA9.6060807@tromer.org> Hi, On Mon, 20 Nov 2006, Eran Tromer wrote: > On 2006-11-20 19:09, Horst H. von Brand wrote: > >> > >> A------------F master > >> \ / > >> B--C--D--E > >> > >> Yes, E and F have identical trees. There has been only _one_ line of history, so why introduce what was not there? It sounds more like you do not trust "E" to be something especially useful, but in that case you should not merge it to begin with. Ciao,