Permalink
Commits on Dec 27, 2012
  1. Git 1.8.0.3

    gitster committed Dec 27, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. git(1): show link to contributor summary page

    gitster committed Dec 12, 2012
    We earlier removed a link to list of contributors that pointed to a
    defunct page; let's use a working one from Ohloh.net to replace it
    instead.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'sl/maint-git-svn-docs' into maint

    gitster committed Dec 27, 2012
    * sl/maint-git-svn-docs:
      git-svn: Note about tags.
      git-svn: Expand documentation for --follow-parent
      git-svn: Recommend use of structure options.
      git-svn: Document branches with at-sign(@).
  4. git-svn: Note about tags.

    sleske committed with gitster Nov 23, 2012
    Document that 'git svn' will import SVN tags as branches.
    
    Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. git-svn: Expand documentation for --follow-parent

    sleske committed with gitster Nov 30, 2012
    Describe what the option --follow-parent does, and what happens if it is
    set or unset.
    
    Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. git-svn: Recommend use of structure options.

    sleske committed with gitster Nov 30, 2012
    Document that when using git svn, one should usually either use the
    directory structure options to import branches as branches, or only
    import one subdirectory. The default behaviour of cloning all branches
    and tags as subdirectories in the working copy is usually not what the
    user wants.
    
    Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. git-svn: Document branches with at-sign(@).

    sleske committed with gitster Nov 30, 2012
    git svn sometimes creates branches with an at-sign in the name
    (branchname@revision). These branches confuse many users and it is a FAQ
    why they are created. Document when git svn creates them.
    
    Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
    Acked-by: Eric Wong <normalperson@yhbt.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Merge branch 'gb/maint-doc-svn-log-window-size' into maint

    gitster committed Dec 27, 2012
    * branch 'gb/maint-doc-svn-log-window-size':
      Document git-svn fetch --log-window-size parameter
  9. Merge branch 'km/maint-doc-git-reset' into maint

    gitster committed Dec 27, 2012
    * branch 'km/maint-doc-git-reset':
      doc: git-reset: make "<mode>" optional
  10. git-remote-helpers.txt: document invocation before input format

    fingolfin committed with gitster Nov 27, 2012
    In the distant past, the order things were documented was
    'Invocation', 'Commands', 'Capabilities', ...
    
    Then it was decided that before giving a list of Commands, there
    should be an overall description of the 'Input format', which was
    a wise decision. However, this description was put as the very
    first thing, with the rationale that any implementor would want
    to know that first.
    
    However, it seems an implementor would actually first need to
    know how the remote helper will be invoked, so moving
    'Invocation' to the front again seems logical. Moreover, we now
    don't switch from discussing the input format to the invocation
    style and then back to input related stuff.
    
    Signed-off-by: Max Horn <max@quendi.de>
    Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. Merge branch 'jk/avoid-mailto-invalid-in-doc' into maint

    gitster committed Dec 27, 2012
    * jk/avoid-mailto-invalid-in-doc:
      Documentation: don't link to example mail addresses
  12. Merge branch 'tj/maint-doc-commit-sign' into maint

    gitster committed Dec 27, 2012
    * branch 'tj/maint-doc-commit-sign':
      Add -S, --gpg-sign option to manpage of "git commit"
  13. Documentation: move diff.wordRegex from config.txt to diff-config.txt

    artagnon committed with gitster Nov 13, 2012
    19299a8 (Documentation: Move diff.<driver>.* from config.txt to
    diff-config.txt, 2011-04-07) moved the diff configuration options to
    diff-config.txt, but forgot about diff.wordRegex, which was left
    behind in config.txt.  Fix this.
    
    Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
    Acked-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 23, 2012
  1. Merge branch 'jc/doc-diff-blobs' into maint

    gitster committed Dec 23, 2012
    * jc/doc-diff-blobs:
      Documentation: Describe "git diff <blob> <blob>" separately
  2. Merge branch 'cr/doc-checkout-branch' into maint

    gitster committed Dec 23, 2012
    * cr/doc-checkout-branch:
      Documentation/git-checkout.txt: document 70c9ac2 behavior
      Documentation/git-checkout.txt: clarify usage
  3. Merge branch 'ta/api-index-doc' into maint

    gitster committed Dec 23, 2012
    * ta/api-index-doc:
      Remove misleading date from api-index-skel.txt
  4. Merge branch 'as/doc-for-devs' into maint

    gitster committed Dec 23, 2012
    * as/doc-for-devs:
      Documentation: move support for old compilers to CodingGuidelines
      SubmittingPatches: add convention of prefixing commit messages
  5. Merge branch 'sl/readme-gplv2' into maint

    gitster committed Dec 23, 2012
    * sl/readme-gplv2:
      README: it does not matter who the current maintainer is
      README: Git is released under the GPLv2, not just "the GPL"
  6. Merge branch 'jc/fetch-tags-doc' into maint

    gitster committed Dec 23, 2012
    * jc/fetch-tags-doc:
      fetch --tags: clarify documentation
  7. Merge branch 'nd/index-format-doc' into maint

    gitster committed Dec 23, 2012
    * nd/index-format-doc:
      index-format.txt: clarify what is "invalid"
  8. Merge branch 'jk/mailmap-cleanup' into maint

    gitster committed Dec 23, 2012
    * jk/mailmap-cleanup:
      contrib: update stats/mailmap script
      .mailmap: normalize emails for Linus Torvalds
      .mailmap: normalize emails for Jeff King
      .mailmap: fix broken entry for Martin Langhoff
      .mailmap: match up some obvious names/emails
  9. Merge branch 'ta/doc-cleanup' into maint

    gitster committed Dec 23, 2012
    * ta/doc-cleanup:
      Documentation: build html for all files in technical and howto
      Documentation/howto: convert plain text files to asciidoc
      Documentation/technical: convert plain text files to asciidoc
      Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt
      Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1
      Split over-long synopsis in git-fetch-pack.txt into several lines
  10. Sort howto documents in howto-index.txt

    tacker66 committed with gitster Dec 22, 2012
    Howto documents in howto-index.txt were listed in a rather
    random order. So better sort them.
    
    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 18, 2012
  1. Documentation: Describe "git diff <blob> <blob>" separately

    gitster committed Dec 18, 2012
    As it was not a common operation, it was described as if it is a
    side note for the more common two-commit variant, but this mode
    behaves very differently, e.g. it does not make any sense to ask
    recursive behaviour, or give the command a pathspec.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. t7004: do not create unneeded gpghome/gpg.conf when GPG is not used

    gitster committed Dec 18, 2012
    These tests themselves are properly protected by the GPG
    prerequisite, but one of the set-up steps outside the
    test_expect_success block unconditionally assumed that there is a
    gpghome/ directory, which is not true if GPG is not being used.
    
    It may be a good idea to move the whole set-up steps in the test but
    that is a follow-up topic.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation/git-checkout.txt: document 70c9ac2 behavior

    crorvick committed with gitster Dec 17, 2012
    Document the behavior implemented in 70c9ac2 (DWIM "git checkout
    frotz" to "git checkout -b frotz origin/frotz").
    
    Signed-off-by: Chris Rorvick <chris@rorvick.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Documentation/git-checkout.txt: clarify usage

    crorvick committed with gitster Dec 17, 2012
    The forms of checkout that do not take a path are lumped together in
    the DESCRIPTION section, but the description for this group is
    dominated by explanation of the -b|-B form.
    
    Split these apart for more clarity.
    
    Signed-off-by: Chris Rorvick <chris@rorvick.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Merge branch 'jk/pickaxe-textconv' into maint

    gitster committed Dec 18, 2012
    "git log -p -S<string>" now looks for the <string> after applying
    the textconv filter (if defined); earlier it inspected the contents
    of the blobs without filtering.
  6. clarify -M without % symbol in diff-options

    sitaramc committed with gitster Dec 18, 2012
    Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 17, 2012
  1. Documentation: move support for old compilers to CodingGuidelines

    aspiers committed with gitster Dec 16, 2012
    The "Try to be nice to older C compilers" text is clearly a guideline
    to be borne in mind whilst coding rather than when submitting patches.
    
    Signed-off-by: Adam Spiers <git@adamspiers.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. SubmittingPatches: add convention of prefixing commit messages

    aspiers committed with gitster Dec 16, 2012
    Conscientious newcomers to git development will read SubmittingPatches
    and CodingGuidelines, but could easily miss the convention of
    prefixing commit messages with a single word identifying the file
    or area the commit touches.
    
    Signed-off-by: Adam Spiers <git@adamspiers.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation: don't link to example mail addresses

    johnkeeping committed with gitster Dec 16, 2012
    Email addresses in documentation are converted into mailto: hyperlinks
    in the HTML output and footnotes in man pages.  This isn't desirable for
    cases where the address is used as an example and is not valid.
    
    Particularly annoying is the example "jane@laptop.(none)" which appears
    in git-shortlog(1) as "jane@laptop[1].(none)", with note 1 saying:
    
    	1. jane@laptop
    	   mailto:jane@laptop
    
    Fix this by escaping these email addresses with a leading backslash, to
    prevent Asciidoc expanding them as inline macros.
    
    In the case of mailmap.txt, render the address monospaced so that it
    matches the block examples surrounding that paragraph.
    
    Helped-by: Jeff King <peff@peff.net>
    Signed-off-by: John Keeping <john@keeping.me.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 16, 2012
  1. Remove misleading date from api-index-skel.txt

    tacker66 committed with gitster Dec 16, 2012
    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. README: it does not matter who the current maintainer is

    gitster committed Dec 16, 2012
    The audience of this introductory document does not have to know nor
    interact with the maintainer, so drop the mention of him.  Other
    documents such as SubmittingPatches may be a more suitable place to
    have it.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. README: Git is released under the GPLv2, not just "the GPL"

    slattarini committed with gitster Dec 14, 2012
    And this is clearly stressed by Linus in the COPYING file.  So make it
    clear in the README as well, to avoid possible misunderstandings.
    
    Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>