Permalink
Commits on Aug 4, 2017
  1. Git 2.14.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 4, 2017
  2. Merge tag 'v2.13.5' into maint

    gitster committed Aug 4, 2017
  3. Git 2.14

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 4, 2017
  4. Merge branch 'ah/patch-id-doc'

    Docfix.
    
    * ah/patch-id-doc:
      doc: remove unsupported parameter from patch-id
    gitster committed Aug 4, 2017
  5. Merge branch 'as/diff-options-grammofix'

    A grammofix.
    
    * as/diff-options-grammofix:
      diff-options doc: grammar fix
    gitster committed Aug 4, 2017
Commits on Aug 2, 2017
  1. Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po

    l10n for Git 2.14.0 round 2
    
    * tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po:
      l10n: zh_CN: review for git v2.14.0 l10n
      l10n: ko.po: Update Korean translation
      l10n: zh_CN: for git v2.14.0 l10n round 2
      l10n: de.po: various fixes in German translation
      l10n: ru.po: update Russian translation
      l10n: fr.po v2.14.0 rnd 2
      l10n: fr.po Fix some french typos
      l10n: fr.po Fix typo
      l10n: fr.po Fix some translations
      l10n: de.po: update German translation
      l10n: vi.po (3213t): Updated 9 new strings
      l10n: Update Catalan translation
      l10n: bg.po: Updated Bulgarian translation (3213t)
    gitster committed Aug 2, 2017
  2. l10n: zh_CN: review for git v2.14.0 l10n

    Reviewed-by: 依云 <lilydjwg@gmail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Aug 2, 2017
Commits on Aug 1, 2017
  1. Git 2.13.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 1, 2017
  2. Merge tag 'v2.12.4' into maint

    gitster committed Aug 1, 2017
  3. Sync with v2.13.4

    gitster committed Aug 1, 2017
  4. Git 2.13.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Aug 1, 2017
  5. l10n: ko.po: Update Korean translation

    Signed-off-by: Changwoo Ryu <cwryu@debian.org>
    changwoo committed Aug 1, 2017
  6. l10n: zh_CN: for git v2.14.0 l10n round 2

    Translate new l10n messages for git 2.14.0, and update translations on
    "stash".
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Jun 11, 2017
Commits on Jul 31, 2017
  1. Sync with maint

    * maint:
      Preparation for 2.13.4 continues
    gitster committed Jul 31, 2017
  2. Preparation for 2.13.4 continues

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 31, 2017
  3. Merge branch 'ks/doc-fixes' into maint

    Doc clean-up.
    
    * ks/doc-fixes:
      doc: reformat the paragraph containing the 'cut-line'
      doc: camelCase the i18n config variables to improve readability
    gitster committed Jul 31, 2017
  4. Merge branch 'jk/test-copy-bytes-fix' into maint

    A test fix.
    
    * jk/test-copy-bytes-fix:
      t: handle EOF in test_copy_bytes()
    gitster committed Jul 31, 2017
  5. Merge branch 'pw/unquote-path-in-git-pm' into maint

    Code refactoring.
    
    * pw/unquote-path-in-git-pm:
      t9700: add tests for Git::unquote_path()
      Git::unquote_path(): throw an exception on bad path
      Git::unquote_path(): handle '\a'
      add -i: move unquote_path() to Git.pm
    gitster committed Jul 31, 2017
  6. Merge branch 'jk/gc-pre-detach-under-hook' into maint

    We run an early part of "git gc" that deals with refs before
    daemonising (and not under lock) even when running a background
    auto-gc, which caused multiple gc processes attempting to run the
    early part at the same time.  This is now prevented by running the
    early part also under the GC lock.
    
    * jk/gc-pre-detach-under-hook:
      gc: run pre-detach operations under lock
    gitster committed Jul 31, 2017
  7. Merge branch 'jn/hooks-pre-rebase-sample-fix' into maint

    Code clean-up, that makes us in sync with Debian by one patch.
    
    * jn/hooks-pre-rebase-sample-fix:
      pre-rebase hook: capture documentation in a <<here document
    gitster committed Jul 31, 2017
  8. Merge branch 'rs/progress-overall-throughput-at-the-end' into maint

    The progress meter did not give a useful output when we haven't had
    0.5 seconds to measure the throughput during the interval.  Instead
    show the overall throughput rate at the end, which is a much more
    useful number.
    
    * rs/progress-overall-throughput-at-the-end:
      progress: show overall rate in last update
    gitster committed Jul 31, 2017
  9. Merge branch 'tb/push-to-cygwin-unc-path' into maint

    On Cygwin, similar to Windows, "git push //server/share/repository"
    ought to mean a repository on a network share that can be accessed
    locally, but this did not work correctly due to stripping the double
    slashes at the beginning.
    
    This may need to be heavily tested before it gets unleashed to the
    wild, as the change is at a fairly low-level code and would affect
    not just the code to decide if the push destination is local.  There
    may be unexpected fallouts in the path normalization.
    
    * tb/push-to-cygwin-unc-path:
      cygwin: allow pushing to UNC paths
    gitster committed Jul 31, 2017
  10. Merge branch 'rs/apply-avoid-over-reading' into maint

    Code cleanup.
    
    * rs/apply-avoid-over-reading:
      apply: use strcmp(3) for comparing strings in gitdiff_verify_name()
      apply: use starts_with() in gitdiff_verify_name()
    gitster committed Jul 31, 2017
  11. Merge branch 'js/blame-lib'

    A hotfix to a topic already in 'master'.
    
    * js/blame-lib:
      blame: fix memory corruption scrambling revision name in error message
    gitster committed Jul 31, 2017
  12. diff-options doc: grammar fix

    Signed-off-by: Anthony Sottile <asottile@umich.edu>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    asottile committed with gitster Jul 31, 2017
Commits on Jul 30, 2017
  1. Git 2.12.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2017
  2. Merge tag 'v2.11.3' into maint-2.12

    Git 2.11.3
    gitster committed Jul 30, 2017
  3. Git 2.11.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2017
  4. Merge tag 'v2.10.4' into maint-2.11

    Git 2.10.4
    gitster committed Jul 30, 2017
  5. Git 2.10.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2017
  6. Merge tag 'v2.9.5' into maint-2.10

    Git 2.9.5
    gitster committed Jul 30, 2017
  7. Git 2.9.5

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2017
  8. Merge tag 'v2.8.6' into maint-2.9

    Git 2.8.6
    gitster committed Jul 30, 2017
  9. Git 2.8.6

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jul 30, 2017