Merge branch 'mk/combine-diff-context-horizon-fix' into maint

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index eb2883c94cfad91efcc1f70bbdbc1609a3702d3b..d51481394c08ef6e0706bc6ff0ccd6908cddc7b8 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -162,8 +162,7 @@ useful if you write an alias or script around 'git push'.
        linkgit:git-pull[1] and other commands. For more information,
        see 'branch.<name>.merge' in linkgit:git-config[1].
 
---thin::
---no-thin::
+--[no-]thin::
        These options are passed to linkgit:git-send-pack[1]. A thin transfer
        significantly reduces the amount of sent data when the sender and
        receiver share many of the same objects in common. The default is