[PATCH (resend)] filter-branch: Fix word usage in documentation
From: Kevin Ballard <hidden>
Date: 2016-08-13 23:22:50
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
The documentation for --commit-filter in git-filter-branch talks about setting multiple parents for the "ancestors of the original commit". This is logically impossible. I believe the intended word was "descendants". Signed-off-by: Kevin Ballard <redacted> --- Documentation/git-filter-branch.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 8d80f0d..959a9e9 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt@@ -113,7 +113,7 @@ OPTIONS stdin. The commit id is expected on stdout. + As a special extension, the commit filter may emit multiple -commit ids; in that case, ancestors of the original commit will +commit ids; in that case, descendants of the original commit will have all of them as parents. + You can use the 'map' convenience function in this filter, and other
--
1.5.5.1.243.g4a6979