git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 13/17] Documentation: remove stray backslash in show-branch discussion

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Aug 23, 2010, 11:36 UTC
Message-ID
<20100823113618.GA14959@kytes>
In-Reply-To
<201008231318.30768.trast@student.ethz.ch>
Hi,
Thomas Rast writes:
Show 28 quoted lines
> 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
Previous: Thomas RastNext: Jonathan Nieder
Message 16 of 22 in “unexpected backslashes in man pages”
  1. 00/17 unexpected backslashes in man pagesJonathan Nieder, Aug 20, 2010
  2. 01/17 Documentation: tweak description of log.dateJonathan Nieder, Aug 20, 2010
  3. 02/17 Documentation: quoting trouble in "git rm" discussionJonathan Nieder, Aug 20, 2010
  4. 03/17 Documentation: unbreak regex in show-ref manualJonathan Nieder, Aug 20, 2010
  5. 04/17 Documentation: clarify quoting in "git add" exampleJonathan Nieder, Aug 20, 2010
  6. 05/17 Documentation: add missing quotes to "git grep" examplesJonathan Nieder, Aug 20, 2010
  7. 06/17 Documentation: clarify quoting in "git rm" exampleJonathan Nieder, Aug 20, 2010
  8. 07/17 Documentation: clarify quoting in gitignore docsJonathan Nieder, Aug 20, 2010
  9. 08/17 Documentation: remove backslashes in manpage synopsesJonathan Nieder, Aug 20, 2010
  10. 09/17 Documentation/technical: avoid stray backslash in parse-options API docsJonathan Nieder, Aug 20, 2010
  11. 10/17 Documentation: remove stray backslash from "git bundle" manualJonathan Nieder, Aug 20, 2010
  12. 11/17 Documentation: remove backslash before ~ in fast-import manualJonathan Nieder, Aug 20, 2010
  13. 12/17 Documentation: remove stray backslashes in rev-parse manualJonathan Nieder, Aug 20, 2010
  14. 13/17 Documentation: remove stray backslash in show-branch discussionJonathan Nieder, Aug 20, 2010
  15. Thomas RastAug 23, 2010
  16. Ramkumar RamachandraAug 23, 2010
  17. Jonathan NiederAug 23, 2010
  18. 14/17 Documentation: avoid stray backslashes in core tutorialJonathan Nieder, Aug 20, 2010
  19. 15/17 Documentation: avoid stray backslash in user manualJonathan Nieder, Aug 20, 2010
  20. 16/17 Documentation: do not convert ... operator to ellipsesJonathan Nieder, Aug 20, 2010
  21. 17/17 Documentation: remove stray backslashes from "Fighting regressions" articleJonathan Nieder, Aug 20, 2010
  22. Thomas RastAug 23, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.