diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
commit | 81aa96497686bd31c5a9a3cdf110c2e10c799c03 (patch) | |
tree | 58e9c7e1f74d2d002ca8cc0c59eec8ade805f9f5 /Documentation | |
parent | tests: remove exit after test_done call (diff) | |
parent | git submodule: fix usage line (diff) | |
download | tgif-81aa96497686bd31c5a9a3cdf110c2e10c799c03.tar.xz |
Merge branch 'maint'
* maint:
git submodule: fix usage line
doc/git-pack-refs: fix two grammar issues
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-pack-refs.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-pack-refs.txt b/Documentation/git-pack-refs.txt index a5244d35f4..1ee99c208c 100644 --- a/Documentation/git-pack-refs.txt +++ b/Documentation/git-pack-refs.txt @@ -26,7 +26,7 @@ problem by stashing the refs in a single file, traditional `$GIT_DIR/refs` hierarchy, it is looked up in this file and used if found. -Subsequent updates to branches always creates new file under +Subsequent updates to branches always create new files under `$GIT_DIR/refs` hierarchy. A recommended practice to deal with a repository with too many @@ -35,7 +35,7 @@ occasionally run `git pack-refs \--prune`. Tags are by definition stationary and are not expected to change. Branch heads will be packed with the initial `pack-refs --all`, but only the currently active branch heads will become unpacked, -and next `pack-refs` (without `--all`) will leave them +and the next `pack-refs` (without `--all`) will leave them unpacked. |