From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jonathon Mah <me@JonathonMah.com>,
git@vger.kernel.org, Dan McGee <dpmcgee@gmail.com>
Subject: Re: [PATCH] mergetool: Use args as pathspec to unmerged files
Date: Sun, 25 Sep 2011 02:45:01 +0200 [thread overview]
Message-ID: <20110925004459.GA19780@gmail.com> (raw)
In-Reply-To: <7vaaa4fdix.fsf@alter.siamese.dyndns.org>
On Fri, Sep 16, 2011 at 01:17:10PM -0700, Junio C Hamano wrote:
> Jonathon Mah <me@JonathonMah.com> writes:
>
> > Mergetool now treats its path arguments as a pathspec (like other git
> > subcommands), restricting action to the given files and directories.
> > Files matching the pathspec are filtered so mergetool only acts on
> > unmerged paths; previously it would assume each path argument was in an
> > unresolved state, and get confused when it couldn't check out their
> > other stages.
> >
> > Running "git mergetool subdir" will prompt to resolve all conflicted
> > blobs under subdir.
> >
> > Signed-off-by: Jonathon Mah <me@JonathonMah.com>
>
> It looks like this simplifies the code quote a bit and make the result
> easier to follow ;-) Nicely done.
>
> As nobody reads from a pipe in while loop and runs merge_file or prompt
> inside, there no longer is a reason to redirect the original standard
> input and make it available, hence we could perhaps add this patch on top
> of your change.
>
> Ack from mergetool/difftool folks?
I've been on vacation and am just catching up with my git mail.
I just tested:
6bed9767daaa "Merge branch 'jm/mergetool-pathspec' into pu"
and it looks good to me.
FWIW,
Acked-by: David Aguilar <davvid@gmail.com>
Being able to do "git mergetool -- subdir" is very nice!
Thanks guys,
--
David
next prev parent reply other threads:[~2011-09-25 0:44 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-12 20:16 What's cooking in git.git (Sep 2011, #04; Mon, 12) Junio C Hamano
2011-09-12 21:48 ` Junio C Hamano
2011-09-12 21:51 ` Junio C Hamano
2011-09-12 23:27 ` Jeff King
2011-09-13 0:09 ` Junio C Hamano
2011-09-13 9:24 ` Nguyen Thai Ngoc Duy
2011-09-12 21:53 ` Junio C Hamano
2011-09-13 7:32 ` [PATCH v2] Documentation: basic configuration of notes.rewriteRef Thomas Rast
2011-09-13 17:16 ` Junio C Hamano
2011-09-13 17:18 ` Jeff King
2011-09-12 21:55 ` What's cooking in git.git (Sep 2011, #04; Mon, 12) Junio C Hamano
2011-09-12 21:59 ` Junio C Hamano
2011-09-14 2:34 ` Jonathon Mah
2011-09-14 20:57 ` Junio C Hamano
2011-09-16 2:12 ` [PATCH] mergetool: Use args as pathspec to unmerged files Jonathon Mah
2011-09-16 20:17 ` Junio C Hamano
2011-09-25 0:45 ` David Aguilar [this message]
2011-09-26 16:40 ` Junio C Hamano
2011-09-12 22:02 ` What's cooking in git.git (Sep 2011, #04; Mon, 12) Junio C Hamano
2011-09-12 23:15 ` Sverre Rabbelier
2011-09-12 22:56 ` Junio C Hamano
2011-09-13 9:46 ` Erik Faye-Lund
2011-09-29 12:03 ` Pascal Obry
2011-09-12 22:58 ` Junio C Hamano
2011-09-13 12:05 ` Michael J Gruber
[not found] ` <7vk49d5t8u.fsf@alter.siamese.dyndns.org>
2011-09-12 23:15 ` Eric Sunshine
2011-09-12 23:25 ` Junio C Hamano
2011-09-12 23:33 ` Jeff King
2011-09-12 23:53 ` Jeff King
2011-09-13 15:15 ` Brandon Casey
2011-09-13 16:05 ` Jeff King
2011-09-13 16:22 ` Brandon Casey
2011-09-13 7:51 ` John Szakmeister
2011-09-13 15:04 ` Eric Sunshine
2011-09-13 17:20 ` Jeff King
2011-09-12 23:35 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110925004459.GA19780@gmail.com \
--to=davvid@gmail.com \
--cc=dpmcgee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@JonathonMah.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.