From 21da42621489df7824f1fce7180702a9aa540707 Mon Sep 17 00:00:00 2001 From: Nelson Elhage Date: Thu, 18 Feb 2010 22:29:30 -0500 Subject: [PATCH 1/3] Documentation: pack-objects: Clarify --local's semantics. The current documentation suggests that --local also ignores any objects in local packs, which is incorrect. Change the language to be clearer and more parallel to the other options that ignore objects. While we're at it, fix a trivial error in --incremental's documentation. Signed-off-by: Nelson Elhage Signed-off-by: Junio C Hamano --- Documentation/git-pack-objects.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 034caedc39..769f1de6b6 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -119,14 +119,13 @@ base-name:: standard input. --incremental:: - This flag causes an object already in a pack ignored + This flag causes an object already in a pack to be ignored even if it appears in the standard input. --local:: - This flag is similar to `--incremental`; instead of - ignoring all packed objects, it only ignores objects - that are packed and/or not in the local object store - (i.e. borrowed from an alternate). + This flag causes an object that is borrowed from an alternate + object store to be ignored even if it appears in the standard + input. --non-empty:: Only create a packed archive if it would contain at From 3909f14f62fe81d65e62a2fe6b0e3a8c1661d422 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 24 Feb 2010 15:41:27 -0800 Subject: [PATCH 2/3] pack-objects documentation: reword "objects that appear in the standard input" These were written back when we always read objects from the standard input. These days --revs and its friends can feed only the start and end points and have the command internally enumerate the objects. Signed-off-by: Junio C Hamano --- Documentation/git-pack-objects.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 769f1de6b6..1deaa6501e 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -120,12 +120,12 @@ base-name:: --incremental:: This flag causes an object already in a pack to be ignored - even if it appears in the standard input. + even if it would have otherwise been packed. --local:: This flag causes an object that is borrowed from an alternate - object store to be ignored even if it appears in the standard - input. + object store to be ignored even if it would have otherwise been + packed. --non-empty:: Only create a packed archive if it would contain at From 18879bc52668123d75f0e03e27d5e731bf9b40ee Mon Sep 17 00:00:00 2001 From: Nelson Elhage Date: Wed, 24 Feb 2010 19:11:23 -0500 Subject: [PATCH 3/3] pack-objects documentation: Fix --honor-pack-keep as well. Signed-off-by: Nelson Elhage Signed-off-by: Junio C Hamano --- Documentation/git-pack-objects.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 1deaa6501e..8ed09c0b3c 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -115,8 +115,8 @@ base-name:: --honor-pack-keep:: This flag causes an object already in a local pack that - has a .keep file to be ignored, even if it appears in the - standard input. + has a .keep file to be ignored, even if it it would have + otherwise been packed. --incremental:: This flag causes an object already in a pack to be ignored