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
This commit is contained in:
Junio C Hamano 2007-06-30 11:17:19 -07:00
commit 90c88a698e
3 changed files with 17 additions and 7 deletions

View File

@ -49,6 +49,9 @@ branch the `HEAD` at the remote repository actually points at.
'show':: 'show'::
Gives some information about the remote <name>. 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':: 'prune'::
@ -56,6 +59,10 @@ Deletes all stale tracking branches under <name>.
These stale branches have already been removed from the remote repository These stale branches have already been removed from the remote repository
referenced by <name>, but are still locally available in referenced by <name>, but are still locally available in
"remotes/<name>". "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':: 'update'::

View File

@ -14,7 +14,8 @@ DESCRIPTION
----------- -----------
This script is used to combine all objects that do not currently 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 A pack is a collection of objects, individually compressed, with
delta compression applied, stored in a single file, with an delta compression applied, stored in a single file, with an
@ -28,11 +29,13 @@ OPTIONS
-a:: -a::
Instead of incrementally packing the unpacked objects, 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 Especially useful when packing a repository that is used
for private development and there is no need to worry for private development and there is no need to worry
about people fetching via dumb file transfer protocols about people fetching via dumb protocols from it. Use
from it. Use with '-d'. with '-d'. This will clean up the objects that `git prune`
leaves behind, but `git fsck --full` shows as
dangling.
-d:: -d::
After packing, if the newly created packs make some After packing, if the newly created packs make some

View File

@ -94,9 +94,9 @@ all::
# Define OLD_ICONV if your library has an old iconv(), where the second # Define OLD_ICONV if your library has an old iconv(), where the second
# (input buffer pointer) parameter is declared with type (const char **). # (input buffer pointer) parameter is declared with type (const char **).
# #
# Define NO_R_TO_GCC if your gcc does not like "-R/path/lib" that # Define NO_R_TO_GCC_LINKER if your gcc does not like "-R/path/lib"
# tells runtime paths to dynamic libraries; "-Wl,-rpath=/path/lib" # that tells runtime paths to dynamic libraries;
# is used instead. # "-Wl,-rpath=/path/lib" is used instead.
# #
# Define USE_NSEC below if you want git to care about sub-second file mtimes # Define USE_NSEC below if you want git to care about sub-second file mtimes
# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and # and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and