diff --git a/Documentation/git-filter-repo.txt b/Documentation/git-filter-repo.txt index 0ef4d2c..e4b2c61 100644 --- a/Documentation/git-filter-repo.txt +++ b/Documentation/git-filter-repo.txt @@ -372,7 +372,7 @@ commits were (or were not) changed. * All commits in range of the rewrite will be listed, even commits that are unchanged (e.g. because the commit pre-dated when the large file(s) were introduced to the repo). - * An all-zeros hash, or null SHA, represents a non-existant object. + * An all-zeros hash, or null SHA, represents a non-existent object. When in the "new" column, this means the commit was removed entirely. @@ -384,7 +384,7 @@ references were changed. * A header is the first line with the text "old", "new" and "ref" * Reference mappings are in no particular order - * An all-zeros hash, or null SHA, represents a non-existant object. + * An all-zeros hash, or null SHA, represents a non-existent object. When in the "new" column, this means the ref was removed entirely. [[FRESHCLONE]] @@ -1378,7 +1378,7 @@ Issues specific to filter-repo Comments on reversibility ^^^^^^^^^^^^^^^^^^^^^^^^^ -Some people are interested in reversibility of of a rewrite; e.g. rewrite +Some people are interested in reversibility of a rewrite; e.g. rewrite history, possibly add some commits, then unrewrite and get the original history back plus a few new "unrewritten" commits. Obviously this is impossible if your rewrite involves throwing away information @@ -1393,10 +1393,10 @@ likely to be a poor fit for this type of workflow for a few reasons: * rewriting of commit hashes will probably be reversible, but it is possible for rewritten abbreviated hashes to not be unique even if the original abbreviated hashes were. - * filter-repo defaults to several forms of unreversible rewriting that + * filter-repo defaults to several forms of irreversible rewriting that you may need to turn off (e.g. the last two bullet points above or reencoding commit messages into UTF-8); it's possible that additional - forms of unreversible rewrites will be added in the future. + forms of irreversible rewrites will be added in the future. * I assume that people use filter-repo for one-shot conversions, not ongoing data transfers. I explicitly reserve the right to change any API in filter-repo based on this presumption (and a comment to this