git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michal Kiedrowicz <michal.kiedrowicz@gmail.com>
To: Eric Raible <raible@nextest.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] Documentation: fix a typo in git-apply.txt
Date: Fri, 4 Mar 2011 11:43:14 +0100	[thread overview]
Message-ID: <20110304114314.2bc9ce26@mkiedrowicz> (raw)
In-Reply-To: <4D70A345.1010706@nextest.com>

On 04.03.2011 00:31:01 -0800 Eric Raible <raible@nextest.com> wrote:

> On 11:59 AM, Michal Kiedrowicz wrote:
> > On 03.03.2011 15:28:45 -0800 Junio C Hamano <gitster@pobox.com>
> > wrote:
> > 
> >> Michał Kiedrowicz <michal.kiedrowicz@gmail.com> writes:
> >>
> >>> git-apply accepts the --cached option, not --cache.
> >>>
> >>> Signed-off-by: Micha=C5=82 Kiedrowicz
> >>> <michal.kiedrowicz@gmail.com> ---
> >>>  Documentation/git-apply.txt |    2 +-
> >>>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>>
> >>> diff --git Documentation/git-apply.txt Documentation/git-apply.txt
> >>> index 881652f..2dcfc09 100644
> >>> --- Documentation/git-apply.txt
> >>> +++ Documentation/git-apply.txt
> >>
> >> What kind of crap is this?
> >>
> >> We really should make it much harder for people to use funky
> >> src/dst prefix when generating patches.
> > 
> > It's called diff.noprefix=true :). I use it @work to easily
> > copy/paste paths from git-diff output. I guess I should somehow
> > make git.git config ignore global settings.
> 
> The local config will override the global settings automatically.
> 
> 	git config diff.noprefix false
> 
> Should do it.
> 

Yeah, I know, that's what I did eventually. I meant something like

	git config core.ignoreGlobalConfig true

to protect from all changes set in ~/.gitconfig.

      reply	other threads:[~2011-03-04 10:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-03  9:28 [PATCH] Documentation: fix a typo in git-apply.txt Michał Kiedrowicz
2011-03-03 23:28 ` Junio C Hamano
2011-03-04  7:56   ` Michal Kiedrowicz
2011-03-04  8:31     ` Eric Raible
2011-03-04 10:43       ` Michal Kiedrowicz [this message]

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=20110304114314.2bc9ce26@mkiedrowicz \
    --to=michal.kiedrowicz@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=raible@nextest.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 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).