Michał Kiedrowicz [off-list ref] writes:
quoted hunk
git-apply accepts the --cached option, not --cache.
Signed-off-by: Micha=C5=82 Kiedrowicz <redacted>
---
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.
On 03.03.2011 15:28:45 -0800 Junio C Hamano [off-list ref] wrote:
Michał Kiedrowicz [off-list ref] writes:
quoted
git-apply accepts the --cached option, not --cache.
Signed-off-by: Micha=C5=82 Kiedrowicz <redacted>
---
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?= <redacted>
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 <redacted>
---
Documentation/git-apply.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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
On 11:59 AM, Michal Kiedrowicz wrote:
On 03.03.2011 15:28:45 -0800 Junio C Hamano [off-list ref] wrote:
quoted
Michał Kiedrowicz [off-list ref] writes:
quoted
git-apply accepts the --cached option, not --cache.
Signed-off-by: Micha=C5=82 Kiedrowicz <redacted>
---
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.
On 04.03.2011 00:31:01 -0800 Eric Raible [off-list ref] wrote:
On 11:59 AM, Michal Kiedrowicz wrote:
quoted
On 03.03.2011 15:28:45 -0800 Junio C Hamano [off-list ref]
wrote:
quoted
Michał Kiedrowicz [off-list ref] writes:
quoted
git-apply accepts the --cached option, not --cache.
Signed-off-by: Micha=C5=82 Kiedrowicz
[off-list ref] ---
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.