Home » Mailing list archives » git » 2009 » November » 11

[PATCH] Re: Clarify documentation on the "ours" merge strategy.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Nicolas Sebrecht
Subject: [PATCH] Re: Clarify documentation on the "ours" merge strategy.
Date: Wednesday, November 11, 2009 - 2:30 pm

The 11/11/09, Junio C Hamano wrote:

If this strategy is _never_ a good idea in this case, I tend to think
that git should forbid this option, or at least, warn and refer to the
documentation.

-- 
Nicolas Sebrecht
--
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:
git pull --rebase and losing commits, Peter Krefting, (Mon Nov 2, 5:26 am)
Re: git pull --rebase and losing commits, Thomas Rast, (Mon Nov 2, 8:04 am)
Re: git pull --rebase and losing commits, =?iso-8859-1?Q?Bj=F6 ..., (Mon Nov 2, 8:10 am)
Re: git pull --rebase and losing commits, Nanako Shiraishi, (Mon Nov 2, 2:34 pm)
Re: git pull --rebase and losing commits, Randal L. Schwartz, (Mon Nov 2, 9:27 pm)
Re: git pull --rebase and losing commits, Peter Krefting, (Tue Nov 3, 12:01 am)
Re: git pull --rebase and losing commits, Johannes Schindelin, (Tue Nov 3, 2:52 am)
Re: git pull --rebase and losing commits, Peter Krefting, (Tue Nov 3, 3:12 am)
Re: git pull --rebase and losing commits, Thomas Rast, (Tue Nov 3, 3:12 am)
[PATCH] Clarify documentation on the "ours" merge strategy., Peter Krefting, (Wed Nov 11, 7:03 am)
Re: [PATCH] Clarify documentation on the "ours" merge stra ..., Baz, (Wed Nov 11, 8:13 am)
Re: [PATCH] Clarify documentation on the "ours" merge stra ..., Thomas Rast, (Wed Nov 11, 1:35 pm)
Re: [PATCH] Clarify documentation on the "ours" merge stra ..., Baz, (Wed Nov 11, 1:54 pm)
Re: [PATCH] Clarify documentation on the "ours" merge stra ..., Junio C Hamano, (Wed Nov 11, 2:02 pm)
[PATCH] Re: Clarify documentation on the "ours" merge stra ..., Nicolas Sebrecht, (Wed Nov 11, 2:30 pm)
Re: [PATCH] Re: Clarify documentation on the "ours" merge ..., Thomas Rast, (Wed Nov 11, 4:37 pm)
Re: [PATCH] Re: Clarify documentation on the "ours" merge ..., Junio C Hamano, (Thu Nov 12, 12:55 am)
Re: [PATCH] Re: Clarify documentation on the "ours" merge ..., Peter Krefting, (Thu Nov 12, 2:41 am)
Re: [PATCH] Re: Clarify documentation on the "ours" merge ..., =?iso-8859-1?Q?Bj=F6 ..., (Thu Nov 12, 2:55 am)
Re: [PATCH] Re: Clarify documentation on the "ours" merge ..., Nanako Shiraishi, (Fri Nov 13, 7:12 pm)
Re: [PATCH] Re: Clarify documentation on the "ours" merge ..., Junio C Hamano, (Sun Nov 15, 2:10 am)
[PATCH 0/3] Document and refuse rebase -s ours, Thomas Rast, (Sun Nov 15, 11:25 am)
[PATCH 3/3] rebase: refuse to rebase with -s ours, Thomas Rast, (Sun Nov 15, 11:25 am)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, Sverre Rabbelier, (Sun Nov 15, 11:39 am)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, Thomas Rast, (Sun Nov 15, 11:44 am)
Re: [PATCH 0/3] Document and refuse rebase -s ours, Junio C Hamano, (Sun Nov 15, 2:04 pm)
Re: [PATCH 0/3] Document and refuse rebase -s ours, Thomas Rast, (Sun Nov 15, 2:13 pm)
Re: [PATCH] Re: Clarify documentation on the "ours" merge ..., Peter Krefting, (Mon Nov 16, 1:20 am)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, Johannes Schindelin, (Mon Nov 16, 5:35 am)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, Junio C Hamano, (Mon Nov 16, 12:57 pm)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, Johannes Schindelin, (Mon Nov 16, 2:25 pm)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, Junio C Hamano, (Mon Nov 16, 2:45 pm)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, Sverre Rabbelier, (Mon Nov 16, 3:04 pm)
Re: [PATCH 3/3] rebase: refuse to rebase with -s ours, A Large Angry SCM, (Mon Nov 16, 4:04 pm)