{"thread":{"id":"26643","subject":"[PATCH] Documentation: fix a typo in git-apply.txt","startedAt":"2011-03-03T09:28:30Z","lastAt":"2011-03-04T10:43:14Z","messageCount":5,"participants":["Michał Kiedrowicz","Junio C Hamano","Michal Kiedrowicz","Eric Raible"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"162711","messageId":"1299144510-8143-1-git-send-email-michal.kiedrowicz@gmail.com","threadId":"26643","inReplyTo":null,"subject":"[PATCH] Documentation: fix a typo in git-apply.txt","fromName":"Michał Kiedrowicz","fromEmail":"michal.kiedrowicz@gmail.com","sentAt":"2011-03-03T09:28:30Z","receivedAt":"2011-03-03T09:28:30Z","isPatch":true,"sender":{"key":"michal.kiedrowicz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14072847?v=4"},"body":"git-apply accepts the --cached option, not --cache.\n\nSigned-off-by: Michał Kiedrowicz \n---\n Documentation/git-apply.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git Documentation/git-apply.txt Documentation/git-apply.txt\nindex 881652f..2dcfc09 100644\n--- Documentation/git-apply.txt\n+++ Documentation/git-apply.txt\n@@ -22,7 +22,7 @@ DESCRIPTION\n -----------\n Reads the supplied diff output (i.e. \"a patch\") and applies it to files.\n With the `--index` option the patch is also applied to the index, and\n-with the `--cache` option the patch is only applied to the index.\n+with the `--cached` option the patch is only applied to the index.\n Without these options, the command applies the patch only to files,\n and does not require them to be in a git repository.\n \n-- \n1.7.4.1\n"},{"id":"162741","messageId":"7vlj0v942a.fsf@alter.siamese.dyndns.org","threadId":"26643","inReplyTo":"1299144510-8143-1-git-send-email-michal.kiedrowicz@gmail.com","subject":"Re: [PATCH] Documentation: fix a typo in git-apply.txt","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-03-03T23:28:45Z","receivedAt":"2011-03-03T23:28:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michał Kiedrowicz writes:\n\n> git-apply accepts the --cached option, not --cache.\n>\n> Signed-off-by: Micha=C5=82 Kiedrowicz \n> ---\n> Documentation/git-apply.txt | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git Documentation/git-apply.txt Documentation/git-apply.txt\n> index 881652f..2dcfc09 100644\n> --- Documentation/git-apply.txt\n> +++ Documentation/git-apply.txt\n\nWhat kind of crap is this?\n\nWe really should make it much harder for people to use funky src/dst\nprefix when generating patches.\n"},{"id":"162759","messageId":"20110304085622.6faa0c93@mkiedrowicz","threadId":"26643","inReplyTo":"7vlj0v942a.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] Documentation: fix a typo in git-apply.txt","fromName":"Michal Kiedrowicz","fromEmail":"michal.kiedrowicz@gmail.com","sentAt":"2011-03-04T07:56:22Z","receivedAt":"2011-03-04T07:56:22Z","isPatch":true,"sender":{"key":"michal.kiedrowicz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14072847?v=4"},"body":"On 03.03.2011 15:28:45 -0800 Junio C Hamano wrote:\n\n> Michał Kiedrowicz writes:\n> \n> > git-apply accepts the --cached option, not --cache.\n> >\n> > Signed-off-by: Micha=C5=82 Kiedrowicz \n> > ---\n> > Documentation/git-apply.txt | 2 +-\n> > 1 files changed, 1 insertions(+), 1 deletions(-)\n> >\n> > diff --git Documentation/git-apply.txt Documentation/git-apply.txt\n> > index 881652f..2dcfc09 100644\n> > --- Documentation/git-apply.txt\n> > +++ Documentation/git-apply.txt\n> \n> What kind of crap is this?\n> \n> We really should make it much harder for people to use funky src/dst\n> prefix when generating patches.\n\nIt's called diff.noprefix=true :). I use it @work to easily copy/paste\npaths from git-diff output. I guess I should somehow make git.git\nconfig ignore global settings.\n\n---\nFrom: =?UTF-8?q?Micha=C5=82=20Kiedrowicz?= \nDate: Thu, 3 Mar 2011 09:51:46 +0100\nSubject: [PATCH] Documentation: fix a typo in git-apply.txt\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n\ngit-apply accepts the --cached option, not --cache.\n\nSigned-off-by: Michał Kiedrowicz \n---\n Documentation/git-apply.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 881652f..2dcfc09 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -22,7 +22,7 @@ DESCRIPTION\n -----------\n Reads the supplied diff output (i.e. \"a patch\") and applies it to files.\n With the `--index` option the patch is also applied to the index, and\n-with the `--cache` option the patch is only applied to the index.\n+with the `--cached` option the patch is only applied to the index.\n Without these options, the command applies the patch only to files,\n and does not require them to be in a git repository.\n\n-- \n1.7.4.1\n"},{"id":"162760","messageId":"4D70A345.1010706@nextest.com","threadId":"26643","inReplyTo":"20110304085622.6faa0c93@mkiedrowicz","subject":"Re: Re: [PATCH] Documentation: fix a typo in git-apply.txt","fromName":"Eric Raible","fromEmail":"raible@nextest.com","sentAt":"2011-03-04T08:31:01Z","receivedAt":"2011-03-04T08:31:01Z","isPatch":true,"sender":{"key":"raible@nextest.com","avatar":null},"body":"On 11:59 AM, Michal Kiedrowicz wrote:\n> On 03.03.2011 15:28:45 -0800 Junio C Hamano wrote:\n> \n>> Michał Kiedrowicz writes:\n>>\n>>> git-apply accepts the --cached option, not --cache.\n>>>\n>>> Signed-off-by: Micha=C5=82 Kiedrowicz \n>>> ---\n>>> Documentation/git-apply.txt | 2 +-\n>>> 1 files changed, 1 insertions(+), 1 deletions(-)\n>>>\n>>> diff --git Documentation/git-apply.txt Documentation/git-apply.txt\n>>> index 881652f..2dcfc09 100644\n>>> --- Documentation/git-apply.txt\n>>> +++ Documentation/git-apply.txt\n>>\n>> What kind of crap is this?\n>>\n>> We really should make it much harder for people to use funky src/dst\n>> prefix when generating patches.\n> \n> It's called diff.noprefix=true :). I use it @work to easily copy/paste\n> paths from git-diff output. I guess I should somehow make git.git\n> config ignore global settings.\n\nThe local config will override the global settings automatically.\n\n\tgit config diff.noprefix false\n\nShould do it.\n"},{"id":"162762","messageId":"20110304114314.2bc9ce26@mkiedrowicz","threadId":"26643","inReplyTo":"4D70A345.1010706@nextest.com","subject":"Re: [PATCH] Documentation: fix a typo in git-apply.txt","fromName":"Michal Kiedrowicz","fromEmail":"michal.kiedrowicz@gmail.com","sentAt":"2011-03-04T10:43:14Z","receivedAt":"2011-03-04T10:43:14Z","isPatch":true,"sender":{"key":"michal.kiedrowicz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/14072847?v=4"},"body":"On 04.03.2011 00:31:01 -0800 Eric Raible wrote:\n\n> On 11:59 AM, Michal Kiedrowicz wrote:\n> > On 03.03.2011 15:28:45 -0800 Junio C Hamano \n> > wrote:\n> > \n> >> Michał Kiedrowicz writes:\n> >>\n> >>> git-apply accepts the --cached option, not --cache.\n> >>>\n> >>> Signed-off-by: Micha=C5=82 Kiedrowicz\n> >>> ---\n> >>> Documentation/git-apply.txt | 2 +-\n> >>> 1 files changed, 1 insertions(+), 1 deletions(-)\n> >>>\n> >>> diff --git Documentation/git-apply.txt Documentation/git-apply.txt\n> >>> index 881652f..2dcfc09 100644\n> >>> --- Documentation/git-apply.txt\n> >>> +++ Documentation/git-apply.txt\n> >>\n> >> What kind of crap is this?\n> >>\n> >> We really should make it much harder for people to use funky\n> >> src/dst prefix when generating patches.\n> > \n> > It's called diff.noprefix=true :). I use it @work to easily\n> > copy/paste paths from git-diff output. I guess I should somehow\n> > make git.git config ignore global settings.\n> \n> The local config will override the global settings automatically.\n> \n> \tgit config diff.noprefix false\n> \n> Should do it.\n> \n\nYeah, I know, that's what I did eventually. I meant something like\n\n\tgit config core.ignoreGlobalConfig true\n\nto protect from all changes set in ~/.gitconfig.\n"}]}