Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jul 27, 2015
  1. @gitster

    Git 2.5

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Sync with 2.4.7

    gitster authored
  3. @gitster

    Git 2.4.7

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'jk/pretty-encoding-doc' into maint

    gitster authored
    Doc update.
    
    * jk/pretty-encoding-doc:
      docs: clarify that --encoding can produce invalid sequences
  5. @gitster

    Merge branch 'tb/checkout-doc' into maint

    gitster authored
    Doc update.
    
    * tb/checkout-doc:
      git-checkout.txt: document "git checkout <pathspec>" better
  6. @gitster

    Merge branch 'ls/hint-rev-list-count' into maint

    gitster authored
    * ls/hint-rev-list-count:
      rev-list: add --count to usage guide
  7. @gitster

    Merge branch 'mm/branch-doc-updates' into maint

    gitster authored
    * mm/branch-doc-updates:
      Documentation/branch: document -M and -D in terms of --force
      Documentation/branch: document -d --force and -m --force
  8. @gitster

    Merge branch 'jc/fsck-retire-require-eoh' into maint

    gitster authored
    A fix to a minor regression to "git fsck" in v2.2 era that started
    complaining about a body-less tag object when it lacks a separator
    empty line after its header to separate it with a non-existent body.
    
    * jc/fsck-retire-require-eoh:
      fsck: it is OK for a tag and a commit to lack the body
  9. @gitster

    Merge branch 'et/http-proxyauth' into maint

    gitster authored
    We used to ask libCURL to use the most secure authentication method
    available when talking to an HTTP proxy only when we were told to
    talk to one via configuration variables.  We now ask libCURL to
    always use the most secure authentication method, because the user
    can tell libCURL to use an HTTP proxy via an environment variable
    without using configuration variables.
    
    * et/http-proxyauth:
      http: always use any proxy auth method available
  10. @gitster

    Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maint

    gitster authored
    When you say "!<ENTER>" while running say "git log", you'd confuse
    yourself in the resulting shell, that may look as if you took
    control back to the original shell you spawned "git log" from but
    that isn't what is happening.  To that new shell, we leaked
    GIT_PAGER_IN_USE environment variable that was meant as a local
    communication between the original "Git" and subprocesses that was
    spawned by it after we launched the pager, which caused many
    "interesting" things to happen, e.g. "git diff | cat" still paints
    its output in color by default.
    
    Stop leaking that environment variable to the pager's half of the
    fork; we only need it on "Git" side when we spawn the pager.
    
    * jc/unexport-git-pager-in-use-in-pager:
      pager: do not leak "GIT_PAGER_IN_USE" to the pager
  11. @gitster

    Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maint

    gitster authored
    Avoid possible ssize_t to int truncation.
    
    * mh/strbuf-read-file-returns-ssize-t:
      strbuf: strbuf_read_file() should return ssize_t
  12. @gitster

    Merge branch 'kb/config-unmap-before-renaming' into maint

    gitster authored
    "git config" failed to update the configuration file when the
    underlying filesystem is incapable of renaming a file that is still
    open.
    
    * kb/config-unmap-before-renaming:
      config.c: fix writing config files on Windows network shares
  13. @gitster

    Merge branch 'jk/rev-list-no-bitmap-while-pruning' into maint

    gitster authored
    A minor bugfix when pack bitmap is used with "rev-list --count".
    
    * jk/rev-list-no-bitmap-while-pruning:
      rev-list: disable --use-bitmap-index when pruning commits
  14. @gitster

    Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maint

    gitster authored
    An ancient test framework enhancement to allow color was not
    entirely correct; this makes it work even when tput needs to read
    from the ~/.terminfo under the user's real HOME directory.
    
    * rh/test-color-avoid-terminfo-in-original-home:
      test-lib.sh: fix color support when tput needs ~/.terminfo
      Revert "test-lib.sh: do tests for color support after changing HOME"
  15. @gitster

    Merge branch 'jk/fix-refresh-utime' into maint

    gitster authored
    Fix a small bug in our use of umask() return value.
    
    * jk/fix-refresh-utime:
      check_and_freshen_file: fix reversed success-check
  16. @gitster

    Merge branch 'cb/rebase-am-exit-code' into maint

    gitster authored
    "git rebase" did not exit with failure when format-patch it invoked
    failed for whatever reason.
    
    * cb/rebase-am-exit-code:
      rebase: return non-zero error code if format-patch fails
  17. @gitster

    Merge branch 'jk/index-pack-reduce-recheck' into maint

    gitster authored
    Disable "have we lost a race with competing repack?" check while
    receiving a huge object transfer that runs index-pack.
    
    * jk/index-pack-reduce-recheck:
      index-pack: avoid excessive re-reading of pack directory
Commits on Jul 24, 2015
  1. @gitster

    RelNotes: am.threeWay does not exist (yet)

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Revert "git-am: add am.threeWay config variable"

    gitster authored
    This reverts commit d96a275.
    
    It used to be possible to apply a patch series with "git am mbox"
    and then only after seeing a failure, switch to three-way mode via
    "git am -3" (no other options or arguments).  The commit being
    reverted broke this workflow.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 21, 2015
  1. @gitster

    Git 2.5.0-rc3

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @gitster

    Merge branch 'tf/gitweb-typofix'

    gitster authored
    * tf/gitweb-typofix:
      gitweb: fix typo in man page
  3. @gitster

    Merge tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po

    gitster authored
    l10n-2.5.0-rnd2
    
    * tag 'l10n-2.5.0-rnd2' of git://github.com/git-l10n/git-po:
      l10n: ca.po: update translation
      l10n: de.po: translate 9 new messages
      l10n: Updated Bulgarian translation of git (2359t,0f,0u)
      l10n: zh_CN: for git v2.5.0 l10n round 2
      l10n: sv.po: Update Swedish translation (2359t0f0u)
      l10n: fr v2.5.0 round 2 (2359t)
      l10n: ru.po: update Russian translation
      l10n: Updated Vietnamese translation (2359t)
      l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)
Commits on Jul 20, 2015
  1. @alexhenrie

    l10n: ca.po: update translation

    alexhenrie authored
    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Commits on Jul 17, 2015
  1. @gitster

    Merge branch 'jk/still-interesting'

    gitster authored
    Code clean-up.
    
    * jk/still-interesting:
      revision.c: remove unneeded check for NULL
  2. @gitster

    Merge branch 'es/worktree-add'

    gitster authored
    Update to the "linked checkout" in 2.5.0-rc1.
    
    Instead of "checkout --to" that does not do what "checkout"
    normally does, move the functionality to "git worktree add".
    
    As this makes the end-user experience of the "worktree add" more or
    less complete, I am tempted to say we should cook the other topic
    that removes the internal "new-worktree-mode" hack from "checkout"
    a bit longer in 'next', and release 2.5 final without that one.
    
    * es/worktree-add:
      Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference
      worktree: caution that this is still experimental
      Documentation/git-worktree: fix stale "git checkout --to" references
  3. @sunshineco @gitster

    Documentation/git: fix stale "MULTIPLE CHECKOUT MODE" reference

    sunshineco authored gitster committed
    This should have been changed by 93a3649 (Documentation: move linked
    worktree description from checkout to worktree, 2015-07-06).
    
    Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 16, 2015
  1. @gitster

    worktree: caution that this is still experimental

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. @sunshineco @gitster

    Documentation/git-worktree: fix stale "git checkout --to" references

    sunshineco authored gitster committed
    These should have been changed to "git worktree add" by fc56361
    (worktree: introduce "add" command, 2015-07-06.
    
    Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jul 15, 2015
  1. @jiangxin

    Merge branch 'master' of https://github.com/ralfth/git-po-de

    jiangxin authored
    * 'master' of https://github.com/ralfth/git-po-de:
      l10n: de.po: translate 9 new messages
  2. @gitster

    Sync with 2.4.6

    gitster authored
  3. @gitster

    Git 2.4.6

    gitster authored
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. @gitster

    Merge branch 'jc/diff-ws-error-highlight'

    gitster authored
    A hotfix to a new feature in 2.5.0-rc.
    
    * jc/diff-ws-error-highlight:
      diff: parse ws-error-highlight option more strictly
  5. @gitster

    Merge branch 'mm/describe-doc' into maint

    gitster authored
    Docfix.
    
    * mm/describe-doc:
      Documentation/describe: improve one-line summary
  6. @gitster

    Merge branch 'jc/prompt-document-ps1-state-separator' into maint

    gitster authored
    Docfix.
    
    * jc/prompt-document-ps1-state-separator:
      git-prompt.sh: document GIT_PS1_STATESEPARATOR
  7. @gitster

    Merge branch 'es/osx-header-pollutes-mask-macro' into maint

    gitster authored
    * es/osx-header-pollutes-mask-macro:
      ewah: use less generic macro name
      ewah/bitmap: silence warning about MASK macro redefinition
Something went wrong with that request. Please try again.