Permalink
Commits on Dec 22, 2012
  1. Git 1.8.1-rc3

    gitster committed Dec 22, 2012
    The changes since -rc2 are mostly documentation updates.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 21, 2012
  1. Merge branch 'ta/new-command-howto'

    gitster committed Dec 21, 2012
    * ta/new-command-howto:
      Move ./technical/api-command.txt to ./howto/new-command.txt
  2. Merge branch 'jc/doc-diff-blobs'

    gitster committed Dec 21, 2012
    "git diff <blob> <blob>" was not documented and was only hinted as
    an extension to "git diff <commit> <commit> -- <pathspec>", but
    comparison between two blobs are more special than that.  It does
    not take any pathspec to begin with.
    
    * jc/doc-diff-blobs:
      Documentation: Describe "git diff <blob> <blob>" separately
  3. Merge branch 'cr/doc-checkout-branch'

    gitster committed Dec 21, 2012
    Document the magic "git checkout <no-such-branch>" hack to create
    local branch out of a remote tracking branch that hasn't been
    documented so far.
    
    * cr/doc-checkout-branch:
      Documentation/git-checkout.txt: document 70c9ac2 behavior
      Documentation/git-checkout.txt: clarify usage
  4. Merge branch 'ta/api-index-doc'

    gitster committed Dec 21, 2012
    * ta/api-index-doc:
      Remove misleading date from api-index-skel.txt
  5. Merge branch 'jk/avoid-mailto-invalid-in-doc'

    gitster committed Dec 21, 2012
    Avoids invalid sample e-mail addresses from becoming mailto links
    in the formatted output.
    
    * jk/avoid-mailto-invalid-in-doc:
      Documentation: don't link to example mail addresses
  6. Merge branch 'as/doc-for-devs'

    gitster committed Dec 21, 2012
    It might be a better idea to move the text the bottom one adds to
    the extended description from the quick checklist part.
    
    * as/doc-for-devs:
      Documentation: move support for old compilers to CodingGuidelines
      SubmittingPatches: add convention of prefixing commit messages
  7. Merge branch 'sl/readme-gplv2'

    gitster committed Dec 21, 2012
    Clarify that the project as a whole is GPLv2 only, with some parts
    borrowed under different licenses that are compatible with GPLv2.
    
    * sl/readme-gplv2:
      README: it does not matter who the current maintainer is
      README: Git is released under the GPLv2, not just "the GPL"
  8. Merge branch 'jc/fetch-tags-doc'

    gitster committed Dec 21, 2012
    "git fetch --tags" was explained as if it were "git fetch
    --no-no-tags", which is not the case, causing confusion.
    
    * jc/fetch-tags-doc:
      fetch --tags: clarify documentation
  9. Merge branch 'nd/index-format-doc'

    gitster committed Dec 21, 2012
    * nd/index-format-doc:
      index-format.txt: clarify what is "invalid"
  10. Merge branch 'sl/git-svn-docs'

    gitster committed Dec 21, 2012
    * sl/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(@).
  11. Merge branch 'jk/mailmap-cleanup'

    gitster committed Dec 21, 2012
    Update various entries in our .mailmap file.
    
    * 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
  12. Move ./technical/api-command.txt to ./howto/new-command.txt

    tacker66 committed with gitster Dec 21, 2012
    The contents of this document does not describe any particular API, but
    is more about the way to add a new command, which belongs to the "How To"
    section of the documentation suite.
    
    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 19, 2012
  1. Remove duplicate entry in ./Documentation/Makefile

    tacker66 committed with gitster Dec 19, 2012
    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 18, 2012
  1. Merge branch 'maint'

    gitster committed Dec 18, 2012
    * maint:
      t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
  2. 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>
  3. 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>
  4. 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>
  5. 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>
  6. Sync with 'maint'

    gitster committed Dec 18, 2012
  7. 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.
  8. 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>
Commits on Dec 15, 2012
  1. Git 1.8.1-rc2

    gitster committed Dec 15, 2012
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Renumber list in api-command.txt

    tacker66 committed with gitster Dec 15, 2012
    Start list with 1 instead of 0; ASCIIDOC will renumber it anyway.
    
    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. remote-testsvn: fix unitialized variable

    peff committed with gitster Dec 14, 2012
    In remote-test-svn, there is a parse_rev_note function to
    parse lines of the form "Revision-number" from notes. If it
    finds such a line and parses it, it returns 0, copying the
    value into a "struct rev_note". If it finds an entry that is
    garbled or out of range, it returns -1 to signal an error.
    
    However, if it does not find any "Revision-number" line at
    all, it returns success but does not put anything into the
    rev_note. So upon a successful return, the rev_note may or
    may not be initialized, and the caller has no way of
    knowing.
    
    gcc does not usually catch the use of the unitialized
    variable because the conditional assignment happens in a
    separate function from the point of use. However, when
    compiling with -O3, gcc will inline parse_rev_note and
    notice the problem.
    
    We can fix it by returning "-1" when no note is found (so on
    a zero return, we always found a valid value).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 14, 2012
  1. fetch --tags: clarify documentation

    gitster committed Dec 14, 2012
    Explain that --tags is just like another explicit refspec on the
    command line and as such overrides the default refspecs configured
    via the remote.$name.fetch variable.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Dec 13, 2012
  1. Merge branch 'maint'

    gitster committed Dec 13, 2012
  2. Fix sizeof usage in get_permutations

    Matthew Daley committed with gitster Dec 13, 2012
    Currently it gets the size of an otherwise unrelated, unused variable
    instead of the expected struct size.
    
    Signed-off-by: Matthew Daley <mattjd@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'mh/doc-remote-helpers'

    gitster committed Dec 13, 2012
    * mh/doc-remote-helpers:
      git-remote-helpers.txt: clarify options & ref list attributes
      git-remote-helpers.txt: clarify command <-> capability correspondences
      git-remote-helpers.txt: rearrange description of capabilities
      git-remote-helpers.txt: minor grammar fix
      git-remote-helpers.txt: document missing capabilities
      git-remote-helpers.txt: document invocation before input format