Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
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>
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
Commits on Apr 19, 2015
  1. Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui

    authored
    git-gui 0.20.0
    
    * tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui:
      git-gui: set version 0.20
      git-gui: sv.po: Update Swedish translation (547t0f0u)
      git-gui i18n: Updated Bulgarian translation (547t,0f,0u)
      git-gui: Makes chooser set 'gitdir' to the resolved path
      git-gui: Fixes chooser not accepting gitfiles
      git-gui: reinstate support for Tcl 8.4
      git-gui: fix problem with gui.maxfilesdisplayed
      git-gui: fix verbose loading when git path contains spaces.
      git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows
      git-gui: add configurable tab size to the diff view
      git-gui: Make git-gui lib dir configurable at runime
      git-gui i18n: Updated Bulgarian translation (520t,0f,0u)
      L10n: vi.po (543t): Init translation for Vietnamese
      git-gui: align the new recursive checkbox with the radiobuttons.
      git-gui: Add a 'recursive' checkbox in the clone menu.
Commits on Apr 18, 2015
  1. @patthoyts

    git-gui: set version 0.20

    patthoyts authored
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  2. @nafmo @patthoyts

    git-gui: sv.po: Update Swedish translation (547t0f0u)

    nafmo authored patthoyts committed
    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
  3. @alshopov @patthoyts

    git-gui i18n: Updated Bulgarian translation (547t,0f,0u)

    alshopov authored patthoyts committed
    Signed-off-by: Alexander Shopov <ash@kambanaria.org>
    Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Commits on Apr 16, 2015
  1. Revert "merge: pass verbosity flag down to merge-recursive"

    authored
    This reverts commit 2bf15a3, whose
    intention was good, but the verbosity levels used in merge-recursive
    turns out to be rather uneven.  For example, a merge of two branches
    with conflicting submodule updates used to report CONFLICT: output
    with --quiet but no longer (which *is* desired), while the final
    "Automatic merge failed; fix conflicts and then commit" message is
    still shown even with --quiet (which *is* inconsistent).
    
    Originally reported by Bryan Turner; it is too early to declare what
    the concensus is, but it seems that we would need to level the
    verbosity levels used in merge strategy backends before we can go
    forward.  In the meantime, we'd revert to the old behaviour until
    that happens.
    
    cf. $gmane/267245
Commits on Apr 14, 2015
  1. Git 2.4.0-rc2

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

    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
  3. Merge branch 'jk/merge-quiet'

    authored
    "git merge --quiet" did not squelch messages from the underlying
    merge-recursive strategy.
    
    * jk/merge-quiet:
      merge: pass verbosity flag down to merge-recursive
  4. Merge branch 'jk/pack-corruption-post-mortem'

    authored
    Documentation update.
    
    * jk/pack-corruption-post-mortem:
      howto: document more tools for recovery corruption
  5. Merge branch 'jc/update-instead-into-void'

    authored
    A push into an unborn branch, with "receive.denyCurrentBranch" set
    to "updateInstead", did not check out the working tree as expected.
    
    * jc/update-instead-into-void:
      push-to-deploy: allow pushing into an unborn branch and updating it
  6. Merge branch 'sb/plug-streaming-leak'

    authored
    * sb/plug-streaming-leak:
      streaming.c: fix a memleak
  7. Merge branch 'jn/doc-fast-import-no-16-octopus-limit'

    authored
    Documentation update.
    
    * jn/doc-fast-import-no-16-octopus-limit:
      fast-import doc: remove suggested 16-parent limit
  8. Merge branch 'sb/plug-wt-shortstatus-tracking-leak'

    authored
    * sb/plug-wt-shortstatus-tracking-leak:
      wt-status.c: fix a memleak
Something went wrong with that request. Please try again.