summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-06-23 16:31:02 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-07-01 13:21:37 +0100
commit0edfbe0f8e242efb9c0ae6c0256067af5387e8d0 (patch)
treea9a6dcae8c3db4f7285a5f59df6e837be864bd98 /dgit-maint-merge.7.pod
parentbe986da084946bba91690344b75f46b0fa4a81af (diff)
dgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filter
This is better than just --stat for finding new and deleted files in a new upstream release, which may need accounting for in d/copyright. Closes: #930956 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-merge.7.pod')
-rw-r--r--dgit-maint-merge.7.pod2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index c20a252..31b0393 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -371,7 +371,7 @@ accounting for in your copyright file:
=over 4
- % git diff --stat master..1.2.3 -- . ':!debian'
+ % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'
=back