summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2017-08-22 17:40:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-23 10:39:41 -0700
commit4a4becfb23a2ef98b51bbde3bacda63a85972882 (patch)
treef4af9dd5dc0d44344f9507caf0a598770be1c6dd /builtin/merge-ours.c
parentGit 2.10.4 (diff)
downloadtgif-4a4becfb23a2ef98b51bbde3bacda63a85972882.tar.xz
Doc: clarify that pack-objects makes packs, plural
The documentation for pack-objects describes that it creates "a packed archive of objects", which is confusing because it may create multiple packs if --max-pack-size is set. Update the documentation to clarify this, and explaining in which cases such a feature would be useful. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions