summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-06 22:43:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-06-06 22:43:24 (GMT)
commitd44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (patch)
treeca47f19971689badb2b644d038a72f4b0d9d8f13 /Documentation
parentf07dfbad29d473b35b5fecebf4baf77e32c7f97f (diff)
parente2ac7cb5fbcf1407003aa07cdcd14141527ea2e3 (diff)
downloadgit-d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.zip
git-d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.tar.gz
git-d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3.tar.bz2
Merge branch 'sv/objfixes'
* sv/objfixes: Don't assume tree entries that are not dirs are blobs git-cvsimport: Make sure to use $git_dir always instead of .git sometimes fix documentation of unpack-objects -n Accept dates before 2000/01/01 when specified as seconds since the epoch
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-unpack-objects.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index ff6184b..b1b3ec9 100644
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -27,8 +27,8 @@ new packs and replace existing ones.
OPTIONS
-------
-n::
- Only list the objects that would be unpacked, don't actually unpack
- them.
+ Dry run. Check the pack file without actually unpacking
+ the objects.
-q::
The command usually shows percentage progress. This