Ramkumar Ramachandra wrote:
> This rewrite makes section 0 less verbose and more readable. It is
> intended to be squashed into the previous commit.
Nice.
> +To find the tip of a topic branch, run "git log --first-parent
> +master..pu" and look for the merge commit. The grandparent of this
> +commit is the tip of the topic branch.
The reader is not looking for the second-generation grand-parent foo~2
but the second parent foo^2, using terminology from git-rev-parse.1.
I guess the “second parent” term always involves this potential
confusion. Luckily, the uninitiated reader can infer from the context
that foo~2 is not the intended commit, so there is no need to resort
to awkward phrases like “the second first-generation parent”.
Jonathan
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 0b62b62..8db22ef 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -79,7 +79,7 @@ change is relevant to.
rebase your work.
To find the tip of a topic branch, run "git log --first-parent
-master..pu" and look for the merge commit. The grandparent of this
+master..pu" and look for the merge commit. The second parent of this
commit is the tip of the topic branch.
(1) Make separate commits for logically separate changes.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html