{"thread":{"id":"2515","subject":"[PATCH 0/3] Documentation additions and fixes","startedAt":"2005-11-14T23:20:01Z","lastAt":"2005-11-14T23:20:01Z","messageCount":4,"participants":["Nikolai Weibull"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"11856","messageId":"11320104011696-git-send-email-mailing-lists.git@rawuncut.elitemail.org","threadId":"2515","inReplyTo":null,"subject":"[PATCH 0/3] Documentation additions and fixes","fromName":"Nikolai Weibull","fromEmail":"mailing-lists.git@rawuncut.elitemail.org","sentAt":"2005-11-14T23:20:01Z","receivedAt":"2005-11-14T23:20:01Z","isPatch":true,"sender":{"key":"mailing-lists.git@rawuncut.elitemail.org","avatar":null},"body":"While going over my Zsh-completion functions I found some options still\nmissing from the documentation.  I also found some problems with some of\nthe documentation, so I fixed them as well.\n\n        nikolai\n\n Documentation/git-checkout-index.txt |   10 +++++-----\n Documentation/git-commit-tree.txt    |    2 +-\n Documentation/git-prune-packed.txt   |    6 ++++++\n Documentation/git-read-tree.txt      |    4 ++++\n Documentation/git-unpack-objects.txt |    6 +++++-\n Documentation/git-update-index.txt   |    2 +-\n unpack-objects.c                     |    2 +-\n 7 files changed, 23 insertions(+), 9 deletions(-)\n"},{"id":"11857","messageId":"11320104011582-git-send-email-mailing-lists.git@rawuncut.elitemail.org","threadId":"2515","inReplyTo":"11320104011696-git-send-email-mailing-lists.git@rawuncut.elitemail.org","subject":"[PATCH 1/3] Document the -n command-line option to git-unpack-objects","fromName":"Nikolai Weibull","fromEmail":"mailing-lists.git@rawuncut.elitemail.org","sentAt":"2005-11-14T23:20:01Z","receivedAt":"2005-11-14T23:20:01Z","isPatch":true,"sender":{"key":"mailing-lists.git@rawuncut.elitemail.org","avatar":null},"body":"This patch documents the -n command-line option to git-unpack-objects,\nas it was previously undocumented.\n\nSigned-off-by: Nikolai Weibull <nikolai@bitwi.se>\n\n---\n\n Documentation/git-unpack-objects.txt |    6 +++++-\n unpack-objects.c                     |    2 +-\n 2 files changed, 6 insertions(+), 2 deletions(-)\n\napplies-to: 963d67921d6f65c08d51a8c93811f03274c34703\n0d2b0b51463fe0fed667a7169b94d7ee52677e69\ndiff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt\nindex b716ba1..31ea34d 100644\n--- a/Documentation/git-unpack-objects.txt\n+++ b/Documentation/git-unpack-objects.txt\n@@ -8,7 +8,7 @@ git-unpack-objects - Unpack objects from\n \n SYNOPSIS\n --------\n-'git-unpack-objects' [-q] <pack-file\n+'git-unpack-objects' [-n] [-q] <pack-file\n \n \n DESCRIPTION\n@@ -19,6 +19,10 @@ one-object\" format in $GIT_OBJECT_DIRECT\n \n OPTIONS\n -------\n+-n::\n+        Only list the objects that would be unpacked, don't actually unpack\n+        them.\n+\n -q::\n \tThe command usually shows percentage progress.  This\n \tflag suppresses it.\ndiff --git a/unpack-objects.c b/unpack-objects.c\nindex 8ae1a1c..8490895 100644\n--- a/unpack-objects.c\n+++ b/unpack-objects.c\n@@ -6,7 +6,7 @@\n #include <sys/time.h>\n \n static int dry_run, quiet;\n-static const char unpack_usage[] = \"git-unpack-objects [-q] < pack-file\";\n+static const char unpack_usage[] = \"git-unpack-objects [-n] [-q] < pack-file\";\n \n /* We always read in 4kB chunks. */\n static unsigned char buffer[4096];\n---\n0.99.9g\n"},{"id":"11858","messageId":"11320104011291-git-send-email-mailing-lists.git@rawuncut.elitemail.org","threadId":"2515","inReplyTo":"11320104011582-git-send-email-mailing-lists.git@rawuncut.elitemail.org","subject":"[PATCH 2/3] Document a couple of missing command-line options.","fromName":"Nikolai Weibull","fromEmail":"mailing-lists.git@rawuncut.elitemail.org","sentAt":"2005-11-14T23:20:01Z","receivedAt":"2005-11-14T23:20:01Z","isPatch":true,"sender":{"key":"mailing-lists.git@rawuncut.elitemail.org","avatar":null},"body":"This patch adds documentation to quite a few command-line options.\n\nSigned-off-by: Nikolai Weibull <nikolai@bitwi.se>\n\n---\n\n Documentation/git-checkout-index.txt |   10 +++++-----\n Documentation/git-prune-packed.txt   |    6 ++++++\n Documentation/git-read-tree.txt      |    4 ++++\n 3 files changed, 15 insertions(+), 5 deletions(-)\n\napplies-to: fc4d52c0050cf3af0aa501ba7e33d3e0622f0fdc\n798cec0159df6f4fefd35c63ad4a59a0399bbd22\ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\nindex 94b283a..5bff486 100644\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -18,21 +18,21 @@ Will copy all files listed from the inde\n \n OPTIONS\n -------\n--u::\n+-u|--index::\n \tupdate stat information for the checked out entries in\n \tthe index file.\n \n--q::\n+-q|--quiet::\n \tbe quiet if files exist or are not in the index\n \n--f::\n+-f|--force::\n \tforces overwrite of existing files\n \n--a::\n+-a|--all::\n \tchecks out all files in the index.  Cannot be used\n \ttogether with explicit filenames.\n \n--n::\n+-n|--no-create::\n \tDon't checkout new files, only refresh files already checked\n \tout.\n \ndiff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt\nindex 28a1500..8d96a91 100644\n--- a/Documentation/git-prune-packed.txt\n+++ b/Documentation/git-prune-packed.txt\n@@ -23,6 +23,12 @@ compression applied, stored in a single \n \n Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc.\n \n+OPTIONS\n+-------\n+-n::\n+        Don't actually remove any objects, only show those that would have been\n+        removed.\n+\n Author\n ------\n Written by Linus Torvalds <torvalds@osdl.org>\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex e219c6a..7be0cbd 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -30,6 +30,10 @@ OPTIONS\n -m::\n \tPerform a merge, not just a read.\n \n+--reset::\n+\n+        Same as -m except that unmerged entries will be silently ignored.\n+\n -u::\n \tAfter a successful merge, update the files in the work\n \ttree with the result of the merge.\n---\n0.99.9g\n"},{"id":"11859","messageId":"1132010401671-git-send-email-mailing-lists.git@rawuncut.elitemail.org","threadId":"2515","inReplyTo":"11320104011291-git-send-email-mailing-lists.git@rawuncut.elitemail.org","subject":"[PATCH 3/3] Documentation nitpicking","fromName":"Nikolai Weibull","fromEmail":"mailing-lists.git@rawuncut.elitemail.org","sentAt":"2005-11-14T23:20:01Z","receivedAt":"2005-11-14T23:20:01Z","isPatch":true,"sender":{"key":"mailing-lists.git@rawuncut.elitemail.org","avatar":null},"body":"This patch fixes some small problems with the documentation.\n\nSigned-off-by: Nikolai Weibull <nikolai@bitwi.se>\n\n---\n\n Documentation/git-commit-tree.txt  |    2 +-\n Documentation/git-update-index.txt |    2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\napplies-to: 118fb90e721428900a0588074894a4b198044762\n683a61f6648873de0a73c8c60a86064cf4f4911d\ndiff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt\nindex b64cd6a..5cf6bd3 100644\n--- a/Documentation/git-commit-tree.txt\n+++ b/Documentation/git-commit-tree.txt\n@@ -8,7 +8,7 @@ git-commit-tree - Creates a new commit o\n \n SYNOPSIS\n --------\n-'git-commit-tree' <tree> [-p <parent commit>]\\   < changelog\n+'git-commit-tree' <tree> [-p <parent commit>]\\* < changelog\n \n DESCRIPTION\n -----------\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 52874c8..fdcb8be 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -60,7 +60,7 @@ OPTIONS\n \tDirectly insert the specified info into the index.\n \t\n --index-info::\n-        Read index info from stdin.\n+        Read index information from stdin.\n \n --chmod=(+|-)x::\n         Set the execute permissions on the updated files.        \n---\n0.99.9g\n"}]}