Home » Mailing list archives » git » 2006 » November » 30

Re: [PATCH] git-merge: preserve and merge local changes when doing fast forward

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johannes Schindelin
Subject: Re: [PATCH] git-merge: preserve and merge local changes when doing fast forward
Date: Thursday, November 30, 2006 - 3:32 am

Hi,

On Wed, 29 Nov 2006, Junio C Hamano wrote:


How about "-k|--keep-changes" or "-l|--local-changes", or 
"-p|--preserve-changes"?

BTW from a user's perspective, this operation _is_ a merge, not a 
checkout. So, IMHO the compatibility with that rarely used option of 
git-checkout is neglectable.

Ciao,
Dscho
-
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
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] git-merge: preserve and merge local changes when d ..., Junio C Hamano, (Wed Nov 29, 8:02 pm)
Re: [PATCH] git-merge: preserve and merge local changes wh ..., Carl Worth, (Thu Nov 30, 12:32 am)
Re: [PATCH] git-merge: preserve and merge local changes wh ..., Johannes Schindelin, (Thu Nov 30, 3:32 am)