Re: [PATCH 13/24] merge script: tweak unmerged files message to match builtin

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Ævar Arnfjörð Bjarmason
Date: Tuesday, August 17, 2010 - 12:36 am

On Tue, Aug 17, 2010 at 07:03, Jonathan Nieder <jrnieder@gmail.com> wrote:

I prefer the new one, thanks :)
--
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 01/24] merge: do not mistake (ancestor of) tag for ..., Jonathan Nieder, (Mon Aug 16, 11:52 pm)
[PATCH 02/24] t7600 (merge): modernize style, Jonathan Nieder, (Mon Aug 16, 11:53 pm)
[PATCH 03/24] t7600 (merge): do not launch gitk for --debug, Jonathan Nieder, (Mon Aug 16, 11:54 pm)
[PATCH 04/24] t7600 (merge): check reflog entry, Jonathan Nieder, (Mon Aug 16, 11:56 pm)
[PATCH 06/24] t6010 (merge-base): modernize style, Jonathan Nieder, (Mon Aug 16, 11:57 pm)
[PATCH 07/24] t6200 (fmt-merge-msg): style nitpicks, Jonathan Nieder, (Mon Aug 16, 11:57 pm)
[PATCH 11/24] fmt-merge-msg -m to override subject line, Jonathan Nieder, (Tue Aug 17, 12:02 am)
[PATCH 14/24] merge script: refuse to merge during merge, Jonathan Nieder, (Tue Aug 17, 12:03 am)
[PATCH 15/24] merge script: improve log message subject, Jonathan Nieder, (Tue Aug 17, 12:04 am)
[PATCH 16/24] merge script: merge -X&lt;option&gt;, Jonathan Nieder, (Tue Aug 17, 12:05 am)
[PATCH 17/24] merge script: allow custom strategies, Jonathan Nieder, (Tue Aug 17, 12:05 am)
[PATCH 18/24] merge script: forbid merge -s index, Jonathan Nieder, (Tue Aug 17, 12:06 am)
[PATCH 19/24] merge script: handle -m --log correctly, Jonathan Nieder, (Tue Aug 17, 12:06 am)
[PATCH 20/24] merge script: handle many-way octopus, Jonathan Nieder, (Tue Aug 17, 12:09 am)
[PATCH 21/24] merge script: --ff-only to disallow true merge, Jonathan Nieder, (Tue Aug 17, 12:10 am)
[PATCH 23/24] merge script: notice @{-1} shorthand, Jonathan Nieder, (Tue Aug 17, 12:11 am)
[PATCH 24/24] merge script: learn --[no-]rerere-autoupdate, Jonathan Nieder, (Tue Aug 17, 12:13 am)
Re: [PATCH 03/24] t7600 (merge): do not launch gitk for -- ..., Ævar Arnfjörð Bjarmason, (Tue Aug 17, 12:31 am)
Re: [PATCH 13/24] merge script: tweak unmerged files messa ..., Ævar Arnfjörð Bjarmason, (Tue Aug 17, 12:36 am)
Re: [PATCH/RFC] updating examples/git-merge (plus a builti ..., Ævar Arnfjörð Bjarmason, (Tue Aug 17, 12:46 am)
Re: [PATCH 19/24] merge script: handle -m --log correctly, Tay Ray Chuan, (Tue Aug 17, 2:55 am)
Re: [PATCH 03/24] t7600 (merge): do not launch gitk for -- ..., Sverre Rabbelier, (Tue Aug 17, 10:50 am)
Re: [PATCH 19/24] merge script: handle -m --log correctly, Jonathan Nieder, (Tue Aug 17, 2:54 pm)
[PATCH 11/24 v2] fmt-merge-msg -m to override merge title, Jonathan Nieder, (Tue Aug 17, 4:00 pm)
Re: [PATCH 03/24] t7600 (merge): do not launch gitk for -- ..., Ævar Arnfjörð Bjarmason, (Wed Aug 18, 1:55 am)