From: Junio C Hamano <junkio@cox.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH] Teach 'git apply' to look at $GIT_DIR/config
Date: Sat, 17 Feb 2007 18:15:01 -0800 [thread overview]
Message-ID: <7vejoonrdm.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: Pine.LNX.4.63.0702180259340.22628@wbgn013.biozentrum.uni-wuerzburg.de
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Sat, 17 Feb 2007, Junio C Hamano wrote:
>
>> I do agree diff-file is too confusing with diff-files, but...
>
> ... but nobody writes out diff-files these days, right?
Actually, "diff-files -c -p" while looking at a merge conflict
is the only thing I found "git diff" does not let me do. The
latter always gives condensed combined diff.
next prev parent reply other threads:[~2007-02-18 2:15 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-17 20:37 [PATCH] Teach core.autocrlf to 'git apply' Junio C Hamano
2007-02-17 21:12 ` [PATCH] Teach 'git apply' to look at $GIT_DIR/config Junio C Hamano
2007-02-17 23:26 ` Jeff King
2007-02-17 23:31 ` Junio C Hamano
2007-02-17 23:32 ` Jeff King
2007-02-19 22:57 ` Linus Torvalds
2007-02-19 23:04 ` Shawn O. Pearce
2007-02-19 23:14 ` Junio C Hamano
2007-02-19 23:37 ` Linus Torvalds
2007-02-19 23:57 ` Junio C Hamano
2007-02-20 0:11 ` Linus Torvalds
2007-02-20 0:35 ` Junio C Hamano
2007-02-20 0:53 ` Johannes Schindelin
2007-02-20 1:29 ` Junio C Hamano
2007-02-20 1:43 ` Johannes Schindelin
2007-02-20 1:57 ` [PATCH] git-apply: require -p<n> when working in a subdirectory Junio C Hamano
2007-02-20 2:33 ` [PATCH] apply: fix memory leak in prefix_one() Johannes Schindelin
2007-02-20 2:39 ` Junio C Hamano
2007-02-20 2:45 ` Johannes Schindelin
2007-02-20 1:58 ` [PATCH] git-apply: do not lose cwd when run from a subdirectory Junio C Hamano
2007-02-20 1:28 ` [PATCH] Teach 'git apply' to look at $GIT_DIR/config Junio C Hamano
2007-02-20 1:38 ` Linus Torvalds
2007-02-21 5:39 ` Daniel Barkalow
2007-02-21 11:22 ` Junio C Hamano
2007-02-21 17:00 ` Daniel Barkalow
2007-02-21 16:44 ` Linus Torvalds
2007-02-21 19:35 ` Junio C Hamano
2007-02-21 22:31 ` [PATCH] git-apply: notice "diff --git" patch again Junio C Hamano
2007-02-22 0:24 ` [PATCH] git-apply: guess correct -p<n> value for non-git patches Junio C Hamano
2007-02-20 0:16 ` [PATCH] Teach 'git apply' to look at $GIT_DIR/config Johannes Schindelin
2007-02-20 0:36 ` Simon 'corecode' Schubert
2007-02-18 0:08 ` Johannes Schindelin
2007-02-18 0:28 ` Junio C Hamano
2007-02-18 0:40 ` Johannes Schindelin
2007-02-18 1:03 ` Junio C Hamano
2007-02-18 1:15 ` Johannes Schindelin
2007-02-18 1:47 ` Junio C Hamano
2007-02-18 2:00 ` Johannes Schindelin
2007-02-18 2:15 ` Junio C Hamano [this message]
2007-02-18 11:40 ` Johannes Schindelin
2007-02-18 1:48 ` Jakub Narebski
2007-02-18 0:06 ` Johannes Schindelin
2007-02-18 0:31 ` Junio C Hamano
2007-02-18 0:53 ` Johannes Schindelin
2007-02-18 1:20 ` Junio C Hamano
2007-02-18 1:29 ` Johannes Schindelin
2007-02-18 1:48 ` Junio C Hamano
2007-02-18 2:01 ` Johannes Schindelin
2007-02-18 2:10 ` 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=7vejoonrdm.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 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 NNTP newsgroup(s).