1. 26 Apr, 2012 1 commit
    • Jeff King's avatar
      docs: stop using asciidoc no-inline-literal · 6cf378f0
      Jeff King authored
      In asciidoc 7, backticks like `foo` produced a typographic
      effect, but did not otherwise affect the syntax. In asciidoc
      8, backticks introduce an "inline literal" inside which markup
      is not interpreted. To keep compatibility with existing
      documents, asciidoc 8 has a "no-inline-literal" attribute to
      keep the old behavior. We enabled this so that the
      documentation could be built on either version.
      
      It has been several years now, and asciidoc 7 is no longer
      in wide use. We can now decide whether or not we want
      inline literals on their own merits, which are:
      
        1. The source is much easier to read when the literal
           contains punctuation. You can use `master~1` instead
           of `master{tilde}1`.
      
        2. They are less error-prone. Because of point (1), we
           tend to make mistakes and forget the extra layer of
           quoting.
      
      This patch removes the no-inline-literal attribute from the
      Makefile and converts every use of backticks in the
      documentation to an inline literal (they must be cleaned up,
      or the example above would literally show "{tilde}" in the
      output).
      
      Problematic sites were found by grepping for '`.*[{\\]' and
      examined and fixed manually. The results were then verified
      by comparing the output of "html2text" on the set of
      generated html pages. Doing so revealed that in addition to
      making the source more readable, this patch fixes several
      formatting bugs:
      
        - HTML rendering used the ellipsis character instead of
          literal "..." in code examples (like "git log A...B")
      
        - some code examples used the right-arrow character
          instead of '->' because they failed to quote
      
        - api-config.txt did not quote tilde, and the resulting
          HTML contained a bogus snippet like:
      
            <tt><sub></tt> foo <tt></sub>bar</tt>
      
          which caused some parsers to choke and omit whole
          sections of the page.
      
        - git-commit.txt confused ``foo`` (backticks inside a
          literal) with ``foo'' (matched double-quotes)
      
        - mentions of `A U Thor <author@example.com>` used to
          erroneously auto-generate a mailto footnote for
          author@example.com
      
        - the description of --word-diff=plain incorrectly showed
          the output as "[-removed-] and {added}", not "{+added+}".
      
        - using "prime" notation like:
      
            commit `C` and its replacement `C'`
      
          confused asciidoc into thinking that everything between
          the first backtick and the final apostrophe were meant
          to be inside matched quotes
      
        - asciidoc got confused by the escaping of some of our
          asterisks. In particular,
      
            `credential.\*` and `credential.<url>.\*`
      
          properly escaped the asterisk in the first case, but
          literally passed through the backslash in the second
          case.
      Signed-off-by: default avatarJeff King <peff@peff.net>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      6cf378f0
  2. 08 Mar, 2012 1 commit
  3. 06 Jul, 2011 1 commit
    • Martin von Zweigbergk's avatar
      Documentation: use [verse] for SYNOPSIS sections · 7791a1d9
      Martin von Zweigbergk authored
      The SYNOPSIS sections of most commands that span several lines already
      use [verse] to retain line breaks. Most commands that don't span
      several lines seem not to use [verse]. In the HTML output, [verse]
      does not only preserve line breaks, but also makes the section
      indented, which causes a slight inconsistency between commands that
      use [verse] and those that don't. Use [verse] in all SYNOPSIS sections
      for consistency.
      
      Also remove the blank lines from git-fetch.txt and git-rebase.txt to
      align with the other man pages. In the case of git-rebase.txt, which
      already uses [verse], the blank line makes the [verse] not apply to
      the last line, so removing the blank line also makes the formatting
      within the document more consistent.
      
      While at it, add single quotes to 'git cvsimport' for consistency with
      other commands.
      Signed-off-by: default avatarMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      7791a1d9
  4. 11 Mar, 2011 1 commit
    • Jeff King's avatar
      doc: drop author/documentation sections from most pages · 48bb914e
      Jeff King authored
      The point of these sections is generally to:
      
        1. Give credit where it is due.
      
        2. Give the reader an idea of where to ask questions or
           file bug reports.
      
      But they don't do a good job of either case. For (1), they
      are out of date and incomplete. A much more accurate answer
      can be gotten through shortlog or blame.  For (2), the
      correct contact point is generally git@vger, and even if you
      wanted to cc the contact point, the out-of-date and
      incomplete fields mean you're likely sending to somebody
      useless.
      
      So let's drop the fields entirely from all manpages except
      git(1) itself. We already point people to the mailing list
      for bug reports there, and we can update the Authors section
      to give credit to the major contributors and point to
      shortlog and blame for more information.
      
      Each page has a "This is part of git" footer, so people can
      follow that to the main git manpage.
      48bb914e
  5. 02 Mar, 2011 1 commit
  6. 05 Jul, 2010 1 commit
  7. 10 Jan, 2010 1 commit
    • Thomas Rast's avatar
      Documentation: spell 'git cmd' without dash throughout · 0b444cdb
      Thomas Rast authored
      The documentation was quite inconsistent when spelling 'git cmd' if it
      only refers to the program, not to some specific invocation syntax:
      both 'git-cmd' and 'git cmd' spellings exist.
      
      The current trend goes towards dashless forms, and there is precedent
      in 647ac702 (git-svn.txt: stop using dash-form of commands.,
      2009-07-07) to actively eliminate the dashed variants.
      
      Replace 'git-cmd' with 'git cmd' throughout, except where git-shell,
      git-cvsserver, git-upload-pack, git-receive-pack, and
      git-upload-archive are concerned, because those really live in the
      $PATH.
      0b444cdb
  8. 28 Jul, 2009 1 commit
  9. 13 Jun, 2009 1 commit
  10. 08 Aug, 2008 1 commit
    • Junio C Hamano's avatar
      asciidoc markup fixes · 0f4f4d15
      Junio C Hamano authored
      I see quite a few pages on k.org site, e.g.
      
          http://www.kernel.org/pub/software/scm/git/docs/git-rerere.html
          (scroll down to find "After this test merge")
      
      are misformatted to lose teletype text '+' that is followed by a comma,
      and turns the following paragraph all typeset in teletype.
      
      This patch seems to fix the issue at the site (meaning, with the
      particular vintage of asciidoc and docbook toolchain), without breaking
      things with the version I have at my primary development machine, but
      wider testing is very much appreciated.
      
      After this patch,
      
          git grep '`+`,' -- Documentation
      
      should report noting.
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      0f4f4d15
  11. 02 Aug, 2008 1 commit
  12. 23 Jul, 2008 1 commit
  13. 21 Jul, 2008 1 commit
  14. 05 Jul, 2008 4 commits
  15. 02 Jul, 2008 2 commits
    • Jonathan Nieder's avatar
      Documentation formatting and cleanup · 483bc4f0
      Jonathan Nieder authored
      Following what appears to be the predominant style, format
      names of commands and commandlines both as `teletype text`.
      
      While we're at it, add articles ("a" and "the") in some
      places, italicize the name of the command in the manual page
      synopsis line, and add a comma or two where it seems appropriate.
      Signed-off-by: default avatarJonathan Nieder <jrnieder@uchicago.edu>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      483bc4f0
    • Jonathan Nieder's avatar
      Documentation: be consistent about "git-" versus "git " · b1889c36
      Jonathan Nieder authored
      Since the git-* commands are not installed in $(bindir), using
      "git-command <parameters>" in examples in the documentation is
      not a good idea. On the other hand, it is nice to be able to
      refer to each command using one hyphenated word. (There is no
      escaping it, anyway: man page names cannot have spaces in them.)
      
      This patch retains the dash in naming an operation, command,
      program, process, or action. Complete command lines that can
      be entered at a shell (i.e., without options omitted) are
      made to use the dashless form.
      
      The changes consist only of replacing some spaces with hyphens
      and vice versa. After a "s/ /-/g", the unpatched and patched
      versions are identical.
      Signed-off-by: default avatarJonathan Nieder <jrnieder@uchicago.edu>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      b1889c36
  16. 06 Jun, 2008 1 commit
  17. 15 Jan, 2008 1 commit
    • Junio C Hamano's avatar
      Fix git-rerere documentation · 11c57e6a
      Junio C Hamano authored
      rerere.enabled is _not_ on by default.  The command is enabled if rr-cache
      exists even when rerere.enabled is missing, and enabled or disabled by
      explicitly setting the rerere.enabled variable.
      11c57e6a
  18. 07 Jan, 2008 1 commit
    • Dan McGee's avatar
      Documentation: rename gitlink macro to linkgit · 5162e697
      Dan McGee authored
      Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock
      Asciidoc configuration:
      
      @@ -149,7 +153,10 @@
       # Inline macros.
       # Backslash prefix required for escape processing.
       # (?s) re flag for line spanning.
      -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
      +
      +# Explicit so they can be nested.
      +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])=
      +
       # Anchor: [[[id]]]. Bibliographic anchor.
       (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3
       # Anchor: [[id,xreflabel]]
      
      This default regex now matches explicit values, and unfortunately in this
      case gitlink was being matched by just 'link', causing the wrong inline
      macro template to be applied. By renaming the macro, we can avoid being
      matched by the wrong regex.
      Signed-off-by: Dan McGee's avatarDan McGee <dpmcgee@gmail.com>
      Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
      5162e697
  19. 04 Dec, 2007 1 commit
  20. 07 Jul, 2007 1 commit
  21. 17 Feb, 2007 1 commit
  22. 18 Jan, 2007 1 commit
  23. 17 Jan, 2007 1 commit
  24. 15 Jan, 2007 1 commit
    • Nicolas Pitre's avatar
      some doc updates · c14261ea
      Nicolas Pitre authored
      1) talk about "git merge" instead of "git pull ."
      
      2) suggest "git repo-config" instead of directly editing config files
      
      3) echo "URL: blah" > .git/remotes/foo is obsolete and should be
         "git repo-config remote.foo.url blah"
      
      4) support for partial URL prefix has been removed (see commit
         ea560e6d) so drop mention of it.
      Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      c14261ea
  25. 27 Dec, 2006 1 commit
  26. 09 Dec, 2006 2 commits
  27. 07 Feb, 2006 1 commit
    • Junio C Hamano's avatar
      git-rerere: reuse recorded resolve. · 8389b52b
      Junio C Hamano authored
      In a workflow that employs relatively long lived topic branches,
      the developer sometimes needs to resolve the same conflict over
      and over again until the topic branches are done (either merged
      to the "release" branch, or sent out and accepted upstream).
      
      This commit introduces a new command, "git rerere", to help this
      process by recording the conflicted automerge results and
      corresponding hand-resolve results on the initial manual merge,
      and later by noticing the same conflicted automerge and applying
      the previously recorded hand resolution using three-way merge.
      Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
      8389b52b