commit 498a90b7427e8ff02cbd2e05d4ad0e2715f32aa7 from: Stefan Sperling date: Thu Jul 25 13:47:22 2019 UTC got.1 wording fix: "base branch" -> branch commit - ba67992ea0f5fd4ec45f2e7dcf47bcd8bd4ace5f commit + 498a90b7427e8ff02cbd2e05d4ad0e2715f32aa7 blob - 5117f94f5a3f3f43f6176f7e0c2fce0bece4244c blob + e28eea6121fbe31b9b62a16593f349d41bb9fbd0 --- got/got.1 +++ got/got.1 @@ -719,8 +719,8 @@ Lines may be re-ordered to change the order of commits .Pp Edited commits are accumulated on a temporary branch. Once history editing has completed successfully, the temporary branch becomes -the new version of the work tree's base branch and the work tree is -automatically switched to it. +the new version of the work tree's branch and the work tree is automatically +switched to it. .Pp While merging commits, show the status of each affected file, using the following status codes: