diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-06-30 11:17:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-06-30 11:17:19 -0700 |
commit | 90c88a698e8bf36ff5812a177f8b6c2f878f229c (patch) | |
tree | 9ec632350aa0d4abb989a274dbe8145d3bc234f4 /Documentation | |
parent | git-tag: Fix "can't shift that many". (diff) | |
parent | Correct the name of NO_R_TO_GCC_LINKER in the comment describing it. (diff) | |
download | tgif-90c88a698e8bf36ff5812a177f8b6c2f878f229c.tar.xz |
Merge branch 'maint'
* maint:
Correct the name of NO_R_TO_GCC_LINKER in the comment describing it.
git-remote: document -n
repack: improve documentation on -a option
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-remote.txt | 7 | ||||
-rw-r--r-- | Documentation/git-repack.txt | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index ab232c2f68..61a6022ce8 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -49,6 +49,9 @@ branch the `HEAD` at the remote repository actually points at. 'show':: Gives some information about the remote <name>. ++ +With `-n` option, the remote heads are not queried first with +`git ls-remote <name>`; cached information is used instead. 'prune':: @@ -56,6 +59,10 @@ Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in "remotes/<name>". ++ +With `-n` option, the remote heads are not confirmed first with `git +ls-remote <name>`; cached information is used instead. Use with +caution. 'update':: diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index c33a512ffb..28949397ca 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -14,7 +14,8 @@ DESCRIPTION ----------- This script is used to combine all objects that do not currently -reside in a "pack", into a pack. +reside in a "pack", into a pack. It can also be used to re-organise +existing packs into a single, more efficient pack. A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an @@ -28,11 +29,13 @@ OPTIONS -a:: Instead of incrementally packing the unpacked objects, - pack everything available into a single pack. + pack everything referenced into a single pack. Especially useful when packing a repository that is used for private development and there is no need to worry - about people fetching via dumb file transfer protocols - from it. Use with '-d'. + about people fetching via dumb protocols from it. Use + with '-d'. This will clean up the objects that `git prune` + leaves behind, but `git fsck --full` shows as + dangling. -d:: After packing, if the newly created packs make some |