Merge branch 'bc/repack'

* bc/repack:
  Documentation/git-repack.txt: document new -A behaviour
  let pack-objects do the writing of unreachable objects as loose objects
  add a force_object_loose() function
  builtin-gc.c: deprecate --prune, it now really has no effect
  git-gc: always use -A when manually repacking
  repack: modify behavior of -A option to leave unreferenced objects unpacked

Conflicts:

	builtin-pack-objects.c

diff --cc Documentation/git-repack.txt
Simple merge

diff --cc builtin-pack-objects.c
index e20851e1c9c9ad517314794b7c8d4e3615afa9c5,5a10119fbd4f62c7a94c49c8d91c966f177331c1..f43eb67016ee719d34d2e2f4ae8d77e1ec74b396
--- 1/builtin-pack-objects.c
--- 2/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -66,8 -66,7 +67,8 @@@ static struct pack_idx_entry **written_
  static uint32_t nr_objects, nr_alloc, nr_result, nr_written;
  
  static int non_empty;
 -static int no_reuse_delta, no_reuse_object, keep_unreachable, unpack_unreachable, include_tag;
 +static int reuse_delta = 1, reuse_object = 1;
- static int keep_unreachable, include_tag;
++static int keep_unreachable, unpack_unreachable, include_tag;
  static int local;
  static int incremental;
  static int allow_ofs_delta;

diff --cc cache.h
Simple merge

diff --cc git-repack.sh
index 501519ab6897c2463c054e3f7310efc6721c432f,607f217b78997605b0cca7a9df8c9876022c41c4..10f735cff561c6606f5c2bd3f9feec1d6f6ae52e
--- 1/git-repack.sh
--- 2/git-repack.sh
+++ b/git-repack.sh
@@@ -8,10 -8,9 +8,10 @@@ OPTIONS_SPEC="
  git-repack [options]
  --
  a               pack everything in a single pack
- A               same as -a, and keep unreachable objects too
+ A               same as -a, and turn unreachable objects loose
  d               remove redundant packs, and run git-prune-packed
  f               pass --no-reuse-delta to git-pack-objects
 +n               do not run git-update-server-info
  q,quiet         be quiet
  l               pass --local to git-pack-objects
   Packing constraints