threads / patch / 26643

patchDocumentation: fix a typo in git-apply.txt

Subject: [PATCH] Documentation: fix a typo in git-apply.txt

## tl;dr

5 messages between Mar 3, 2011 and Mar 4, 2011. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Michał Kiedrowicz· Mar 3, 2011, 09:28 UTC · lore

git-apply accepts the --cached option, not --cache.

Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
---
 Documentation/git-apply.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to diff +1 −1

diff --git Documentation/git-apply.txt Documentation/git-apply.txt
index 881652f..2dcfc09 100644
--- Documentation/git-apply.txt
+++ Documentation/git-apply.txt
@@ -22,7 +22,7 @@ DESCRIPTION
 -----------
 Reads the supplied diff output (i.e. "a patch") and applies it to files.
 With the `--index` option the patch is also applied to the index, and
-with the `--cache` option the patch is only applied to the index.
+with the `--cached` option the patch is only applied to the index.
 Without these options, the command applies the patch only to files,
 and does not require them to be in a git repository.

-- 
1.7.4.1

Junio C Hamano· Mar 3, 2011, 23:28 UTC · re: Michał Kiedrowicz · lore

Re: [PATCH] Documentation: fix a typo in git-apply.txt

Michał Kiedrowicz <michal.kiedrowicz@gmail.com> writes:

Show 11 quoted lines

> 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.

Michal Kiedrowicz· Mar 4, 2011, 07:56 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation: fix a typo in git-apply.txt

On 03.03.2011 15:28:45 -0800 Junio C Hamano <gitster@pobox.com> wrote:

Show 18 quoted lines

> 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.

---
From: =?UTF-8?q?Micha=C5=82=20Kiedrowicz?= <michal.kiedrowicz@gmail.com>
Date: Thu, 3 Mar 2011 09:51:46 +0100
Subject: [PATCH] Documentation: fix a typo in git-apply.txt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-apply accepts the --cached option, not --cache.

Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
---
 Documentation/git-apply.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to Documentation/git-apply.txt +1 −1

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 881652f..2dcfc09 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -22,7 +22,7 @@ DESCRIPTION
 -----------
 Reads the supplied diff output (i.e. "a patch") and applies it to files.
 With the `--index` option the patch is also applied to the index, and
-with the `--cache` option the patch is only applied to the index.
+with the `--cached` option the patch is only applied to the index.
 Without these options, the command applies the patch only to files,
 and does not require them to be in a git repository.

-- 
1.7.4.1

Eric Raible· Mar 4, 2011, 08:31 UTC · re: Michal Kiedrowicz · lore

Re: Re: [PATCH] Documentation: fix a typo in git-apply.txt

On 11:59 AM, Michal Kiedrowicz wrote:

Show 24 quoted lines

> 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.

Michal Kiedrowicz· Mar 4, 2011, 10:43 UTC · re: Eric Raible · lore

Re: [PATCH] Documentation: fix a typo in git-apply.txt

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

Show 33 quoted lines

> 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.