diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-07-25 11:45:03 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-07-25 11:45:03 +0400 |
commit | 130b04ab37d74e574d525df7948b963b13c6bdbf (patch) | |
tree | a39a6d5e46d3ee24dcc1f2f141efe4f0a20a9581 /Documentation | |
parent | a7c1ef3e03985c70aeb0825634471bb6240f4fcb (diff) | |
parent | 7f3140cd23f126e578ccaaea8c2cebe36824a7ac (diff) |
Merge branch 'js/maint-graft-unhide-true-parents'
* js/maint-graft-unhide-true-parents:
git repack: keep commits hidden by a graft
Add a test showing that 'git repack' throws away grafted-away parents
Conflicts:
git-repack.sh
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-pack-objects.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 7d4c1a7556..2e4992970e 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -11,7 +11,8 @@ SYNOPSIS [verse] 'git pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] [--all-progress] - [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list + [--revs [--unpacked | --all]*] [--stdout | base-name] + [--keep-true-parents] < object-list DESCRIPTION @@ -197,6 +198,10 @@ base-name:: to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset. +--keep-true-parents:: + With this option, parents that are hidden by grafts are packed + nevertheless. + Author ------ |