Merge branch 'hn/branch-delete-merged' into next

The 'git branch' command has been taught the '--delete-merged' option
to remove local branches that are already merged into their tracked
remote-tracking branches.

* hn/branch-delete-merged:
  branch: add --dry-run for --delete-merged
  branch: add branch.<name>.deleteMerged opt-out
  branch: add --delete-merged <branch>
  branch: prepare delete_branches for a bulk caller
  branch: let delete_branches skip unmerged branches on bulk refusal
  branch: convert delete_branches() to a flags argument
  branch: add --forked filter for --list mode

diff --cc Documentation/config/branch.adoc
Simple merge

diff --cc builtin/branch.c
index 031a4a9d05555820b015ebc400c734e01f06a499,fa8f3ee4dff90ee649524feffef53e761f07b0cd..fe9376e5f1e830621714f07e5a4851c320305db3
--- 1/builtin/branch.c
--- 2/builtin/branch.c
+++ b/builtin/branch.c
@@@ -257,10 -275,9 +275,10 @@@ static int delete_branches(int argc, co
  
        for (i = 0; i < argc; i++, strbuf_reset(&bname)) {
                char *target = NULL;
-               int flags = 0;
+               int ref_flags = 0;
  
 -              copy_branchname(&bname, argv[i], allowed_interpret);
 +              copy_branchname(the_repository, &bname,
 +                              argv[i], allowed_interpret);
                free(name);
                name = mkpathdup(fmt, bname.buf);
  

diff --cc ref-filter.c
Simple merge

diff --cc t/t3200-branch.sh
Simple merge