Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 38ac60947bc6c4cbfc8aae70a92f9163fefed442..aaa88526291a26db55c7ebb0833faefda9c7e5a4 100644 (file)
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -38,12 +38,11 @@ OPTIONS
        dangling.
 
 -A::
-       Same as `-a`, but any unreachable objects in a previous
-       pack become loose, unpacked objects, instead of being
-       left in the old pack.  Unreachable objects are never
-       intentionally added to a pack, even when repacking.
-       When used with '-d', this option
-       prevents unreachable objects from being immediately
+       Same as `-a`, unless '-d' is used.  Then any unreachable
+       objects in a previous pack become loose, unpacked objects,
+       instead of being left in the old pack.  Unreachable objects
+       are never intentionally added to a pack, even when repacking.
+       This option prevents unreachable objects from being immediately
        deleted by way of being left in the old pack and then
        removed.  Instead, the loose unreachable objects
        will be pruned according to normal expiry rules
@@ -60,7 +59,7 @@ OPTIONS
        linkgit:git-pack-objects[1].
 
 -f::
-       Pass the `--no-reuse-delta` option to 'git-pack-objects'. See
+       Pass the `--no-reuse-object` option to `git-pack-objects`, see
        linkgit:git-pack-objects[1].
 
 -q::