git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Thomas Rast <tr@thomasrast.ch>,
	Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: [PATCH v2 0/2] mergetool: don't skip modify/remove conflicts
Date: Sat, 12 Feb 2011 23:09:56 -0500	[thread overview]
Message-ID: <1297570198-21103-1-git-send-email-martin.von.zweigbergk@gmail.com> (raw)
In-Reply-To: <1297134518-4387-1-git-send-email-martin.von.zweigbergk@gmail.com>

Trying again. I hope it looks better this time. The second patch could
be squashed with the first one.

This applies on top of jc/rerere-remaining.

Martin von Zweigbergk (2):
  mergetool: don't skip modify/remove conflicts
  rerere: factor out common conflict search code

 builtin/rerere.c     |   21 +++++-----
 git-mergetool.sh     |    2 +-
 rerere.c             |  109 +++++++++++++++++++++++++++++---------------------
 rerere.h             |    8 ++++
 t/t7610-mergetool.sh |   40 +++++++++++++++---
 5 files changed, 117 insertions(+), 63 deletions(-)

-- 
1.7.4.rc2.33.g8a14f

  parent reply	other threads:[~2011-02-13  4:10 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-08  3:08 [PATCH] mergetool: don't skip modify/remove conflicts Martin von Zweigbergk
2011-02-09 21:45 ` Junio C Hamano
2011-02-11  2:46   ` Martin von Zweigbergk
2011-02-13  4:09 ` Martin von Zweigbergk [this message]
2011-02-13  4:09   ` [PATCH v2 1/2] " Martin von Zweigbergk
2011-02-15  0:54     ` Junio C Hamano
2011-02-15  3:30       ` Martin von Zweigbergk
2011-02-15 20:12         ` Junio C Hamano
2011-02-16 10:47           ` [PATCH v3 0/2] " Martin von Zweigbergk
2011-02-16 10:47             ` [PATCH v3 1/2] rerere "remaining" Martin von Zweigbergk
2011-02-16 21:14               ` Junio C Hamano
2011-02-16 10:47             ` [PATCH v3 2/2] mergetool: don't skip modify/remove conflicts Martin von Zweigbergk
2011-02-13  4:09   ` [PATCH v2 2/2] rerere: factor out common conflict search code Martin von Zweigbergk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1297570198-21103-1-git-send-email-martin.von.zweigbergk@gmail.com \
    --to=martin.von.zweigbergk@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tr@thomasrast.ch \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).