Home » Mailing list archives » git » 2010 » September » 29

Re: [PATCH 00/18] git notes merge

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Johan Herland
Subject: Re: [PATCH 00/18] git notes merge
Date: Wednesday, September 29, 2010 - 8:16 am

On Wednesday 29 September 2010, Sverre Rabbelier wrote:

Yeah, I'm torn as well. What about providing both? Or is that bloat?


Maybe there _should_ be a 'git merge --abort' (as a synonym to 'git 
reset --merge')?


...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net
--
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 00/18] git notes merge, Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 01/18] (trivial) notes.h: Minor documentation fixes ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 02/18] notes.h: Make default_notes_ref() available ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 03/18] notes.h/c: Clarify the handling of notes obj ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 04/18] notes.h/c: Propagate combine_notes_fn return ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 05/18] (trivial) t3303: Indent with tabs instead of ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 06/18] notes.c: Use two newlines (instead of one) w ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 07/18] builtin/notes.c: Split notes ref DWIMmery in ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 08/18] git notes merge: Initial implementation hand ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 09/18] builtin/notes.c: Refactor creation of notes ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 10/18] git notes merge: Handle real, non-conflictin ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 11/18] git notes merge: Add automatic conflict reso ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 12/18] Documentation: Preliminary docs on 'git note ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 13/18] git notes merge: Manual conflict resolution, ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 14/18] git notes merge: Manual conflict resolution, ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 15/18] git notes merge: List conflicting notes in n ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 16/18] git notes merge: --commit should fail if und ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 17/18] git notes merge: Add another auto-resolving ..., Johan Herland, (Tue Sep 28, 5:23 pm)
[PATCH 18/18] git notes merge: Add testcases for merging n ..., Johan Herland, (Tue Sep 28, 5:23 pm)
Re: [PATCH 00/18] git notes merge, Sverre Rabbelier, (Wed Sep 29, 7:56 am)
Re: [PATCH 00/18] git notes merge, Johan Herland, (Wed Sep 29, 8:16 am)
Re: [PATCH 00/18] git notes merge, Sverre Rabbelier, (Wed Sep 29, 8:20 am)
Re: [PATCH 00/18] git notes merge, Johan Herland, (Wed Sep 29, 9:04 am)
Re: [PATCH 14/18] git notes merge: Manual conflict resolut ..., Ævar Arnfjörð Bjarmason, (Wed Sep 29, 9:19 am)
Re: [PATCH 10/18] git notes merge: Handle real, non-confli ..., Ævar Arnfjörð Bjarmason, (Wed Sep 29, 9:20 am)
Re: [PATCH 10/18] git notes merge: Handle real, non-confli ..., Johan Herland, (Wed Sep 29, 4:25 pm)
Re: [PATCH 14/18] git notes merge: Manual conflict resolut ..., Johan Herland, (Wed Sep 29, 4:37 pm)
Re: [PATCH 12/18] Documentation: Preliminary docs on 'git ..., Stephen Boyd, (Sat Oct 2, 1:55 am)
Re: [PATCH 11/18] git notes merge: Add automatic conflict ..., Stephen Boyd, (Sat Oct 2, 2:14 am)
Re: [PATCH 11/18] git notes merge: Add automatic conflict ..., Johan Herland, (Mon Oct 4, 8:10 am)
Re: [PATCH 12/18] Documentation: Preliminary docs on 'git ..., Johan Herland, (Mon Oct 4, 8:15 am)
Re: [PATCH 01/18] (trivial) notes.h: Minor documentation f ..., Jonathan Nieder, (Tue Oct 5, 7:55 am)
Re: [PATCH 03/18] notes.h/c: Clarify the handling of notes ..., Jonathan Nieder, (Tue Oct 5, 8:21 am)
Re: [PATCH 01/18] (trivial) notes.h: Minor documentation f ..., Johan Herland, (Tue Oct 5, 8:22 am)
Re: [PATCH 01/18] (trivial) notes.h: Minor documentation f ..., Jonathan Nieder, (Tue Oct 5, 8:26 am)
Re: [PATCH 04/18] notes.h/c: Propagate combine_notes_fn re ..., Jonathan Nieder, (Tue Oct 5, 8:38 am)
Re: [PATCH 07/18] builtin/notes.c: Split notes ref DWIMmer ..., Jonathan Nieder, (Tue Oct 5, 8:50 am)
Re: [PATCH 03/18] notes.h/c: Clarify the handling of notes ..., Johan Herland, (Tue Oct 5, 3:30 pm)
Re: [PATCH 04/18] notes.h/c: Propagate combine_notes_fn re ..., Johan Herland, (Wed Oct 6, 12:40 pm)
Test script style (Re: [PATCH 08/18] git notes merge: Init ..., Jonathan Nieder, (Wed Oct 6, 9:37 pm)
Re: Test script style (Re: [PATCH 08/18] git notes merge: ..., Junio C Hamano, (Wed Oct 6, 9:57 pm)
Re: [PATCH 08/18] git notes merge: Initial implementation ..., Jonathan Nieder, (Wed Oct 6, 11:24 pm)
Re: [PATCH 07/18] builtin/notes.c: Split notes ref DWIMmer ..., Johan Herland, (Thu Oct 7, 6:56 am)
Re: [PATCH 08/18] git notes merge: Initial implementation ..., Johan Herland, (Fri Oct 8, 4:55 pm)
Re: [PATCH 08/18] git notes merge: Initial implementation ..., Jonathan Nieder, (Sat Oct 9, 10:29 am)
Re: [PATCH 08/18] git notes merge: Initial implementation ..., Johan Herland, (Wed Oct 20, 7:12 pm)