[PATCH v5 0/5] branch: prune-merged

["Harald Nordgren via GitGitGadget" <gitgitgadget@gmail.com>]

Drop commit 'fetch: add --prune-merged'

Harald Nordgren (5):
  branch: add --forked <remote>
  branch: let delete_branches warn instead of error on bulk refusal
  branch: add --prune-merged <remote>
  branch: add branch.<name>.pruneMerged opt-out
  branch: add --all-remotes flag

 Documentation/config/branch.adoc |   7 +
 Documentation/git-branch.adoc    |  32 ++++
 builtin/branch.c                 | 289 +++++++++++++++++++++++++++++--
 t/t3200-branch.sh                | 247 ++++++++++++++++++++++++++
 4 files changed, 564 insertions(+), 11 deletions(-)


base-commit: 94f057755b7941b321fd11fec1b2e3ca5313a4e0
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2285%2FHaraldNordgren%2Ffetch-prune-local-branches-v5
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2285/HaraldNordgren/fetch-prune-local-branches-v5
Pull-Request: https://github.com/git/git/pull/2285

Range-diff vs v4:

 1:  77e67d4b8b = 1:  77e67d4b8b branch: add --forked <remote>
 2:  807c9f981f = 2:  807c9f981f branch: let delete_branches warn instead of error on bulk refusal
 3:  77beb620d7 = 3:  77beb620d7 branch: add --prune-merged <remote>
 4:  98cfdb87d2 < -:  ---------- fetch: add --prune-merged
 5:  c645526bb5 ! 4:  cf69fb5767 branch: add branch.<name>.pruneMerged opt-out
     @@ Documentation/config/branch.adoc: for details).
      +
      +`branch.<name>.pruneMerged`::
      +	If set to `false`, branch _<name>_ is exempt from
     -+	`git branch --prune-merged` (and `git fetch --prune-merged`).
     ++	`git branch --prune-merged`.
      +	Useful for topic branches you intend to develop further after
      +	an initial round has been merged upstream. Defaults to true.
      +	Explicit deletion via `git branch -d` is unaffected.
 6:  690242d89b = 5:  f2cee8c79b branch: add --all-remotes flag

-- 
gitgitgadget