Home » Mailing list archives » git » 2007 » August » 9

Re: [PATCH] git-merge: do up-to-date check also for strategies ours, subtree.

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jeff King <peff@...>
To: Junio C Hamano <gitster@...>
Cc: Gerrit Pape <pape@...>, <git@...>
Subject: Re: [PATCH] git-merge: do up-to-date check also for strategies ours, subtree.
Date: Thursday, August 9, 2007 - 8:01 pm

On Thu, Aug 09, 2007 at 02:11:24PM -0700, Junio C Hamano wrote:


Maybe it was the "I'm using a custom merge strategy that might refuse
the merge, but fast-forwards don't even invoke my merge strategy"
request?

-Peff
-
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: do up-to-date check also for strategies o..., Gerrit Pape, (Thu Aug 9, 8:08 am)
[PATCH] git-merge: do up-to-date check also for all strategies, Junio C Hamano, (Thu Aug 16, 2:19 am)
Re: [PATCH] git-merge: do up-to-date check also for strategi..., Junio C Hamano, (Thu Aug 9, 5:11 pm)
Re: [PATCH] git-merge: do up-to-date check also for strategi..., Gerrit Pape, (Fri Aug 10, 9:58 am)
Re: [PATCH] git-merge: do up-to-date check also for strategi..., Junio C Hamano, (Fri Aug 10, 4:45 am)
Re: [PATCH] git-merge: do up-to-date check also for strategi..., Junio C Hamano, (Fri Aug 10, 4:51 am)
Re: [PATCH] git-merge: do up-to-date check also for strategi..., Jeff King, (Thu Aug 9, 8:01 pm)