Merge branch 'jk/repack-reuse-object' into maint

* jk/repack-reuse-object:
  Documentation: pack.compression: explain how to recompress
  repack: add -F flag to let user choose between --no-reuse-delta/object

Conflicts:
	Documentation/git-repack.txt

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-repack.txt
index af79b86516764617163b020ec3c4d9bbeda9fe9b,9566727f7ad6c1690571f7321f79da951c8c6b50..27f7865b061cc96398f7aa052d162723e1f9255e
--- 1/Documentation/git-repack.txt
--- 2/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@@ -8,7 -8,7 +8,7 @@@ git-repack - Pack unpacked objects in 
  
  SYNOPSIS
  --------
- 'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
 -'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=N] [--depth=N]
++'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
  
  DESCRIPTION
  -----------