ref-filter: make combining --merged & --no-merged an error

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index df1d36e50e85ad07a82a069c3bc32e09755cf22d..1624a35888c2e39f70b925a2f176d53dd02b809e 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -560,6 +560,8 @@ Commits A and B would no longer belong to a branch with a symbolic name,
 and so would be unreachable.  As such, these commits would be removed by
 a `git gc` command on the origin repository.
 
+include::transfer-data-leaks.txt[]
+
 GIT
 ---
 Part of the linkgit:git[1] suite