Re: [PATCH] parse-opt: migrate fmt-merge-msg.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Shawn O. Pearce
Date: Tuesday, September 30, 2008 - 3:46 pm

Pierre Habouzit <madcoder@debian.org> wrote:

It may actually be a good idea to rebase this against master.

Reading Junio's notes for sg/merge-options (the branch this conflict
is coming out of) it sounds like we'd want to revert that anyway.
Its been around since April and Junio was talking about it needing
to be in a 1.7.0 release.  Its not going to graduate anytime soon.

IOW I'm quite tempted to revert sg/merge-options and cancel the
branch out of next.

-- 
Shawn.
--
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:
small warm-up: easy parse-opt migrations., Pierre Habouzit, (Sun Sep 28, 2:45 am)
[PATCH] parse-opt: migrate fmt-merge-msg., Pierre Habouzit, (Sun Sep 28, 2:45 am)
[PATCH] parse-opt: migrate git-merge-base., Pierre Habouzit, (Sun Sep 28, 2:45 am)
[PATCH] parse-opt: migrate builtin-merge-file., Pierre Habouzit, (Sun Sep 28, 2:45 am)
Re: small warm-up: easy parse-opt migrations., Sverre Rabbelier, (Sun Sep 28, 6:20 am)
Re: [PATCH] parse-opt: migrate fmt-merge-msg., Shawn O. Pearce, (Mon Sep 29, 9:35 am)
Re: [PATCH] parse-opt: migrate fmt-merge-msg., Pierre Habouzit, (Tue Sep 30, 1:40 am)
Re: [PATCH] parse-opt: migrate fmt-merge-msg., Shawn O. Pearce, (Tue Sep 30, 12:10 pm)
Re: [PATCH] parse-opt: migrate fmt-merge-msg., Pierre Habouzit, (Tue Sep 30, 2:16 pm)
Re: [PATCH] parse-opt: migrate fmt-merge-msg., Shawn O. Pearce, (Tue Sep 30, 3:46 pm)
[PATCH 1/3] parse-opt: migrate fmt-merge-msg., Pierre Habouzit, (Tue Sep 30, 11:05 pm)
[PATCH 2/3] parse-opt: migrate git-merge-base., Pierre Habouzit, (Tue Sep 30, 11:05 pm)
[PATCH 3/3] parse-opt: migrate builtin-merge-file., Pierre Habouzit, (Tue Sep 30, 11:05 pm)
Re: [PATCH 1/3] parse-opt: migrate fmt-merge-msg., Shawn O. Pearce, (Wed Oct 1, 7:56 am)
Re: [PATCH 3/3] parse-opt: migrate builtin-merge-file., Shawn O. Pearce, (Wed Oct 1, 8:01 am)
Re: [PATCH 1/3] parse-opt: migrate fmt-merge-msg., Pierre Habouzit, (Thu Oct 2, 4:51 am)
[RESEND PATCH] parse-opt: migrate fmt-merge-msg., Pierre Habouzit, (Thu Oct 2, 5:59 am)
[PATCH] parse-opt: migrate git-merge-base., Pierre Habouzit, (Thu Oct 2, 5:59 am)
[RESEND PATCH] parse-opt: migrate builtin-merge-file., Pierre Habouzit, (Thu Oct 2, 5:59 am)