1. 23 Feb, 2013 1 commit
  2. 01 Feb, 2013 1 commit
  3. 04 Apr, 2012 1 commit
  4. 21 Sep, 2011 1 commit
  5. 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 [email protected], 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
  6. 13 Oct, 2010 1 commit
  7. 08 Oct, 2010 1 commit
  8. 20 Aug, 2010 1 commit
  9. 08 May, 2010 1 commit
  10. 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
  11. 10 Nov, 2009 1 commit
  12. 24 Aug, 2009 1 commit
  13. 20 Dec, 2008 1 commit
  14. 29 Jul, 2008 1 commit
    • Alex Riesen's avatar
      Make use of stat.ctime configurable · 1ce4790b
      Alex Riesen authored
      A new configuration variable 'core.trustctime' is introduced to
      allow ignoring st_ctime information when checking if paths
      in the working tree has changed, because there are situations where
      it produces too much false positives.  Like when file system crawlers
      keep changing it when scanning and using the ctime for marking scanned
      files.
      
      The default is to notice ctime changes.
      Signed-off-by: default avatarAlex Riesen <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      1ce4790b
  15. 19 Jul, 2008 1 commit
    • Petr Baudis's avatar
      Documentation: How to ignore local changes in tracked files · 6259ac66
      Petr Baudis authored
      This patch explains more carefully that `.gitignore` concerns only
      untracked files and refers the reader to
      
      	git update-index --assume-unchanged
      
      in the need of ignoring uncommitted changes in already tracked files.
      The description of this option is lifted to a more "porcelainish"
      level and explains the caveats of this usecase.
      
      Whether feasible or not, I believe adding this functionality to
      the porcelain is out of the scope of this patch. (And I personally
      think that referring to the plumbing in the case of such a special
      usage is fine.)
      
      This is currently probably one of the top FAQs at #git and the
      --assume-unchanged switch is not widely known; gitignore(5) is the first
      place where people are likely to look for it.
      Signed-off-by: default avatarPetr Baudis <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      6259ac66
  16. 05 Jul, 2008 1 commit
  17. 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 <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      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 <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      b1889c36
  18. 08 Jun, 2008 1 commit
    • Stephan Beyer's avatar
      Docs: Use "-l::\n--long\n" format in OPTIONS sections · 3240240f
      Stephan Beyer authored
      The OPTIONS section of a documentation file contains a list
      of the options a git command accepts.
      
      Currently there are several variants to describe the case that
      different options (almost) do the same in the OPTIONS section.
      
      Some are:
      
       -f, --foo::
       -f|--foo::
       -f | --foo::
      
      But AsciiDoc has the special form:
      
       -f::
       --foo::
      
      This patch applies this form to the documentation of the whole git suite,
      and removes useless em-dash prevention, so \--foo becomes --foo.
      Signed-off-by: default avatarStephan Beyer <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      3240240f
  19. 06 Jun, 2008 1 commit
  20. 28 May, 2008 1 commit
  21. 15 May, 2008 1 commit
  22. 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 <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      5162e697
  23. 07 Jun, 2007 1 commit
    • Junio C Hamano's avatar
      War on whitespace · a6080a0a
      Junio C Hamano authored
      This uses "git-apply --whitespace=strip" to fix whitespace errors that have
      crept in to our source files over time.  There are a few files that need
      to have trailing whitespaces (most notably, test vectors).  The results
      still passes the test, and build result in Documentation/ area is unchanged.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      a6080a0a
  24. 07 May, 2007 1 commit
  25. 03 Mar, 2007 1 commit
    • Johannes Sixt's avatar
      Add core.symlinks to mark filesystems that do not support symbolic links. · 78a8d641
      Johannes Sixt authored
      Some file systems that can host git repositories and their working copies
      do not support symbolic links. But then if the repository contains a symbolic
      link, it is impossible to check out the working copy.
      
      This patch enables partial support of symbolic links so that it is possible
      to check out a working copy on such a file system.  A new flag
      core.symlinks (which is true by default) can be set to false to indicate
      that the filesystem does not support symbolic links. In this case, symbolic
      links that exist in the trees are checked out as small plain files, and
      checking in modifications of these files preserve the symlink property in
      the database (as long as an entry exists in the index).
      
      Of course, this does not magically make symbolic links work on such defective
      file systems; hence, this solution does not help if the working copy relies
      on that an entry is a real symbolic link.
      Signed-off-by: default avatarJohannes Sixt <[email protected]>
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      78a8d641
  26. 29 Jan, 2007 1 commit
  27. 18 Jan, 2007 1 commit
  28. 13 Nov, 2006 1 commit
  29. 24 Aug, 2006 1 commit
  30. 04 Jun, 2006 1 commit
  31. 06 May, 2006 1 commit
    • Junio C Hamano's avatar
      update-index --again · 83e77a25
      Junio C Hamano authored
      After running 'git-update-index' for some paths, you may want to
      do the update on the same set of paths again.
      
      The new flag --again checks the paths whose index entries are
      are different from the HEAD commit and updates them from the
      working tree contents.
      
      This was brought up by Carl Worth on #git.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      83e77a25
  32. 05 May, 2006 1 commit
  33. 03 May, 2006 2 commits
  34. 28 Apr, 2006 1 commit
  35. 12 Feb, 2006 1 commit
  36. 07 Dec, 2005 1 commit
    • Junio C Hamano's avatar
      update-index: allow --index-info to add higher stages. · d23748a6
      Junio C Hamano authored
      The new merge world order tells the merge strategies to leave
      the cache unmerged and store the automerge result in the working
      tree if automerge is not clean.  This was done for the resolve
      strategy and recursive strategy when no rename is involved, but
      recording a conflicting merge in the rename case could not
      easily be done by the recursive strategy.
      
      This commit adds a new input format, in addition to the exsting
      two, to "update-index --index-info".
      
          (1) mode         SP sha1          TAB path
          The first format is what "git-apply --index-info"
          reports, and used to reconstruct a partial tree
          that is used for phony merge base tree when falling
          back on 3-way merge.
      
          (2) mode SP type SP sha1          TAB path
          The second format is to stuff git-ls-tree output
          into the index file.
      
          (3) mode         SP sha1 SP stage TAB path
          This format is to put higher order stages into the
          index file and matches git-ls-files --stage output.
      
      To place a higher stage entry to the index, the path should
      first be removed by feeding a mode=0 entry for the path, and
      then feeding necessary input lines in the (3) format.
      
      For example, starting with this index:
      
      $ git ls-files -s
      100644 8a1218a1024a212bb3db30becd860315f9f3ac52 0       frotz
      
      $ git update-index --index-info ;# interactive session -- input follows...
      
      0 0000000000000000000000000000000000000000	frotz
      100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1	frotz
      100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2	frotz
      
      The first line of the input feeds 0 as the mode to remove the
      path; the SHA1 does not matter as long as it is well formatted.
      Then the second and third line feeds stage 1 and stage 2 entries
      for that path.  After the above, we would end up with this:
      
      $ git ls-files -s
      100644 8a1218a1024a212bb3db30becd860315f9f3ac52 1	frotz
      100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2	frotz
      
      This completes the groundwork for the new merge world order.
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      d23748a6
  37. 06 Dec, 2005 1 commit
  38. 15 Nov, 2005 1 commit