]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/pack-ref-exclude-include'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2023 19:29:45 +0000 (12:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jun 2023 19:29:45 +0000 (12:29 -0700)
"git pack-refs" learns "--include" and "--exclude" to tweak the ref
hierarchy to be packed using pattern matching.

* jc/pack-ref-exclude-include:
  pack-refs: teach pack-refs --include option
  pack-refs: teach --exclude option to exclude refs from being packed
  docs: clarify git-pack-refs --all will pack all refs

1  2 
refs/debug.c
refs/files-backend.c
refs/packed-backend.c
revision.h

diff --cc refs/debug.c
Simple merge
index bca7b851c5a7a12f936469928cbf608686573644,fcaf842ed4394cdd1e8ee9107e2a65385532aebc..9a8333c0d0708cae4766c6d766ea834f09f01ef3
@@@ -21,6 -19,7 +21,8 @@@
  #include "../worktree.h"
  #include "../wrapper.h"
  #include "../write-or-die.h"
+ #include "../revision.h"
++#include <wildmatch.h>
  
  /*
   * This backend uses the following flags in `ref_update::flags` for
Simple merge
diff --cc revision.h
Simple merge