Hi,
Thomas Rast writes:
> Jonathan Nieder wrote:
> > diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
> > index 81ba296..01fc157 100644
> > --- a/Documentation/git-show-branch.txt
> > +++ b/Documentation/git-show-branch.txt
> > @@ -168,7 +168,7 @@ $ git show-branch master fixes mhf
> > ------------------------------------------------
> >
> > These three branches all forked from a common commit, [master],
> > -whose commit message is "Add \'git show-branch\'". The "fixes"
> > -branch adds one commit "Introduce "reset type" flag to "git reset"".
> > -The "mhf" branch adds many other commits. The current branch
> > -is "master".
> > +whose commit message is "Add {apostrophe}git show-branch{apostrophe}".
> > +The "fixes" branch adds one commit "Introduce "reset type" flag to
> > +"git reset"". The "mhf" branch adds many other commits.
> > +The current branch is "master".
>
> What does this apply on? I tried 'git am -3' but it says
>
> Applying: Documentation: remove stray backslash in show-branch discussion
> Using index info to reconstruct a base tree...
> error: patch failed: Documentation/git-show-branch.txt:168
> error: Documentation/git-show-branch.txt: patch does not apply
> Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Cannot fall back to three-way merge.
> Patch failed at 0013 Documentation: remove stray backslash in show-branch discussion
This series has already been merged into 'pu': jn/doc-backslash in
d4394935b3. Did you try applying to 'master'?
-- Ram
--
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