Commit Diff

Commit:
22a38a4331904c508c1782e5399680ba7069300f
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
update a CAVEAT in got.1 now that 'got merge' exists
Actions:
Patch | Tree
commit - dddbe150a21f404e9c42033d9b00b5561001df7e
commit + 22a38a4331904c508c1782e5399680ba7069300f
blob - 9533f672c44bfa49e2792e725b3f9fc4235148e4
blob + 237c161ab95271094fff0f6ca83316e7b1d60e7d
--- got/got.1
+++ got/got.1
@@ -2931,8 +2931,7 @@ and
 Writing to remote repositories over HTTP or HTTPS protocols requires
 .Xr git-push 1 .
 .It
-The creation of merge commits, i.e. commits with two or more parent commits,
-requires
+The creation of merge commits with more than two parent commits requires
 .Xr git-merge 1 .
 .It
 In situations where files or directories were moved around