From: Eric Wong <e@80x24.org>
Date: Fri, 14 Jun 2019 16:23:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/edit' into next
X-Git-Tag: v1.2.0~179
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=d9aad3a7988262b31ab2171f2c982daf04ac822c

Merge remote-tracking branch 'origin/edit' into next

* origin/edit:
  edit: unlink temporary file when done
  v2writable: replace: kill git processes before reindexing
  edit: drop unwanted headers before noop check
  edit|purge: improve output on rewrites
  edit: new tool to perform edits
  doc: document the --prune option for -index
  admin: expose ->config
  AdminEdit: move editability checks from -purge
  admin: beef up resolve_inboxes to handle purge options
  purge: start moving common options to AdminEdit module
  admin: remove warning arg for unconfigured inboxes
  v2writable: implement ->replace call
  import: switch to "replace_oids" interface for purge
  import: extract_author_info becomes extract_commit_info
  v2writable: consolidate overview and indexing call
---

d9aad3a7988262b31ab2171f2c982daf04ac822c
diff --cc Documentation/include.mk
index 10bd29f0,f5f46d0b..8501adc8
--- a/Documentation/include.mk
+++ b/Documentation/include.mk
@@@ -32,7 -32,7 +32,8 @@@ podtext = $(PODTEXT) $(PODTEXT_OPTS
  # MakeMaker only seems to support manpage sections 1 and 3...
  m1 =
  m1 += public-inbox-compact
 +m1 += public-inbox-convert
+ m1 += public-inbox-edit
  m1 += public-inbox-httpd
  m1 += public-inbox-index
  m1 += public-inbox-mda