Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: snap
Commits on Apr 30, 2015
  1. Git 2.4

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 28, 2015
  1. Merge branch 'mh/multimail-renewal'

    authored
    * mh/multimail-renewal:
      Update git-multimail to version 1.0.2
  2. Merge branch 'mg/show-notes-doc'

    authored
    Documentation fix.
    
    * mg/show-notes-doc:
      rev-list-options.txt: complete sentence about notes matching
  3. Merge branch 'nd/versioncmp-prereleases'

    authored
    * nd/versioncmp-prereleases:
      git tag: mention versionsort.prereleaseSuffix in manpage
  4. Merge branch 'mg/status-v-v'

    authored
    * mg/status-v-v:
      status: document the -v/--verbose option
  5. @mhagger

    Update git-multimail to version 1.0.2

    mhagger authored committed
    The only changes are to the README files, most notably the list of
    maintainers and the project URL.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 27, 2015
  1. Sync with 2.3.7

    authored
  2. Git 2.3.7

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'tb/connect-ipv6-parse-fix' into maint

    authored
    An earlier update to the parser that disects a URL broke an
    address, followed by a colon, followed by an empty string (instead
    of the port number), e.g. ssh://example.com:/path/to/repo.
    
    * tb/connect-ipv6-parse-fix:
      connect.c: ignore extra colon after hostname
  4. Merge branch 'ma/bash-completion-leaking-x' into maint

    authored
    The completion script (in contrib/) contaminated global namespace
    and clobbered on a shell variable $x.
    
    * ma/bash-completion-leaking-x:
      completion: fix global bash variable leak on __gitcompappend
  5. Merge branch 'jc/push-cert' into maint

    authored
    The "git push --signed" protocol extension did not limit what the
    "nonce" that is a server-chosen string can contain or how long it
    can be, which was unnecessarily lax.  Limit both the length and the
    alphabet to a reasonably small space that can still have enough
    entropy.
    
    * jc/push-cert:
      push --signed: tighten what the receiving end can ask to sign
Commits on Apr 24, 2015
  1. @mhagger

    status: document the -v/--verbose option

    mhagger authored committed
    Document `git status -v`, including its new doubled `-vv` form.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 23, 2015
  1. @mhagger

    RelNotes: wordsmithing

    mhagger authored committed
    Make many textual tweaks to the 2.4.0 release notes.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @mhagger

    RelNotes: refer to the rebase -i "todo list", not "insn sheet"

    mhagger authored committed
    "Todo list" is the name that is used in the user-facing documentation.
    
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. @mhagger

    RelNotes: correct name of versionsort.prereleaseSuffix

    mhagger authored committed
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @mhagger

    git tag: mention versionsort.prereleaseSuffix in manpage

    mhagger authored committed
    Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 22, 2015
  1. Git 2.4.0-rc3

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 21, 2015
  1. Sync with maint

    authored
  2. Git 2.3.6

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Merge branch 'jk/colors' into maint

    authored
    "diff-highlight" (in contrib/) used to show byte-by-byte
    differences, which meant that multi-byte characters can be chopped
    in the middle.  It learned to pay attention to character boundaries
    (assuming the UTF-8 payload).
    
    * jk/colors:
      diff-highlight: do not split multibyte characters
  4. Merge branch 'jk/test-annoyances' into maint

    authored
    Test fixes.
    
    * jk/test-annoyances:
      t5551: make EXPENSIVE test cheaper
      t5541: move run_with_cmdline_limit to test-lib.sh
      t: pass GIT_TRACE through Apache
      t: redirect stderr GIT_TRACE to descriptor 4
      t: translate SIGINT to an exit
  5. Merge branch 'pt/enter-repo-comment-fix' into maint

    authored
    Documentation update.
    
    * pt/enter-repo-comment-fix:
      enter_repo(): fix docs to match code
  6. Merge branch 'jz/gitweb-conf-doc-fix' into maint

    authored
    Documentation update.
    
    * jz/gitweb-conf-doc-fix:
      gitweb.conf.txt: say "build-time", not "built-time"
  7. Merge branch 'jk/cherry-pick-docfix' into maint

    authored
    * jk/cherry-pick-docfix:
      cherry-pick: fix docs describing handling of empty commits
  8. Merge branch 'iu/fix-parse-options-h-comment' into maint

    authored
    * iu/fix-parse-options-h-comment:
      parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval
  9. Merge branch 'jg/cguide-we-cannot-count' into maint

    authored
    * jg/cguide-we-cannot-count:
      CodingGuidelines: update 'rough' rule count
  10. Merge branch 'jk/pack-corruption-post-mortem' into maint

    authored
    Documentation update.
    
    * jk/pack-corruption-post-mortem:
      howto: document more tools for recovery corruption
  11. Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint

    authored
    Documentation update.
    
    * jn/doc-fast-import-no-16-octopus-limit:
      fast-import doc: remove suggested 16-parent limit
  12. RelNotes: "merge --quiet" change has been reverted

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Apr 20, 2015
  1. Hopefully the last batch for 2.4

    authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'ps/grep-help-all-callback-arg'

    authored
    Code clean-up.
    
    * ps/grep-help-all-callback-arg:
      grep: correctly initialize help-all option
  3. Merge branch 'tb/connect-ipv6-parse-fix'

    authored
    An earlier update to the parser that disects an address broke an
    address, followed by a colon, followed by an empty string (instead
    of the port number).
    
    * tb/connect-ipv6-parse-fix:
      connect.c: ignore extra colon after hostname
  4. Merge branch 'va/fix-git-p4-tests'

    authored
    Test fixes for git-p4.
    
    * va/fix-git-p4-tests:
      t9814: guarantee only one source exists in git-p4 copy tests
      git-p4: fix copy detection test
      t9814: fix broken shell syntax in git-p4 rename test
  5. Merge branch 'jc/push-cert'

    authored
    The "git push --signed" protocol extension did not limit what the
    "nonce" that is a server-chosen string can contain or how long it
    can be, which was unnecessarily lax.  Limit both the length and the
    alphabet to a reasonably small space that can still have enough
    entropy.
    
    * jc/push-cert:
      push --signed: tighten what the receiving end can ask to sign
  6. Merge branch 'ma/bash-completion-leaking-x'

    authored
    The completion script (in contrib/) contaminated global namespace
    and clobbered on a shell variable $x.
    
    * ma/bash-completion-leaking-x:
      completion: fix global bash variable leak on __gitcompappend
Something went wrong with that request. Please try again.