From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Thomas Rast <tr@thomasrast.ch>,
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: [PATCH v3 0/2] mergetool: don't skip modify/remove conflicts
Date: Wed, 16 Feb 2011 05:47:43 -0500 [thread overview]
Message-ID: <1297853265-18993-1-git-send-email-martin.von.zweigbergk@gmail.com> (raw)
In-Reply-To: <7vbp2dnjkt.fsf@alter.siamese.dyndns.org>
Third round. Reorganized the patches a bit as suggested by Junio. The
first patch now contains all the changes to rerere and the second one
only makes mergetool call 'rerere remaining'.
The only tiny change to the end result is the removal of a blank line.
The series applies on top of master.
Junio C Hamano (1):
rerere "remaining"
Martin von Zweigbergk (1):
mergetool: don't skip modify/remove conflicts
builtin/rerere.c | 17 +++++++++--
git-mergetool.sh | 2 +-
rerere.c | 79 +++++++++++++++++++++++++++++++++++++++++++------
rerere.h | 8 +++++
t/t7610-mergetool.sh | 40 +++++++++++++++++++++----
5 files changed, 126 insertions(+), 20 deletions(-)
--
1.7.4.rc2.33.g8a14f
next prev parent reply other threads:[~2011-02-16 10:48 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 ` [PATCH v2 0/2] " Martin von Zweigbergk
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 ` Martin von Zweigbergk [this message]
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=1297853265-18993-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).