]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'nd/prune-packed-dryrun-verbose'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2013 19:17:52 +0000 (12:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2013 19:17:52 +0000 (12:17 -0700)
* nd/prune-packed-dryrun-verbose:
  prune-packed: avoid implying "1" is DRY_RUN in prune_packed_objects()

1  2 
builtin/prune.c

diff --cc builtin/prune.c
Simple merge