[PATCH] apply: clarify that index information is embedded, not the index itself
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
The Spanish translation got this wrong.
---
Documentation/git-apply.txt | 2 +-
apply.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index b9aa39000f..474be244ca 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -92,7 +92,7 @@ OPTIONS
with the `--reject` and the `--cached` options.
--build-fake-ancestor=<file>::
- Newer 'git diff' output has embedded 'index information'
+ Newer 'git diff' output has 'index information' embedded
for each blob to help identify the original version that
the patch applies to. When this flag is given, and if
the original versions of the blobs are available locally,
diff --git a/apply.c b/apply.c
index f8a046a6a5..86f7cb3d88 100644
--- a/apply.c
+++ b/apply.c
@@ -4987,6 +4987,10 @@ int apply_parse_options(int argc, const char **argv,
OPT_BOOL('3', "3way", &state->threeway,
N_( "attempt three-way merge if a patch does not apply")),
OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,
+ /*
+ * TRANSLATORS: Information about the index is embedded, not the
+ * index itself.
+ */
N_("build a temporary index based on embedded index information")),
/* Think twice before adding "--nul" synonym to this */
OPT_SET_INT('z', NULL, &state->line_termination,
--
2.23.0
Alex Henrie <alexhenrie24@gmail.com>