Skip to content
Commits on Jun 11, 2016
  1. @changwoo
  2. @jiangxin

    Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru

    * 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
      l10n: ru.po: update Russian translation
    jiangxin committed Jun 11, 2016
  3. @DJm00n

    l10n: ru.po: update Russian translation

    Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
    DJm00n committed Jun 11, 2016
Commits on Jun 10, 2016
  1. @ralfth

    l10n: de.po: translate 104 new messages

    Translate 104 new messages came from git.pot update in f517e50
    (l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Jun 10, 2016
Commits on Jun 9, 2016
  1. @oldsharp @jiangxin

    l10n: zh_CN: review for git v2.9.0 l10n round 1

    Signed-off-by: Ray Chen <oldsharp@gmail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    oldsharp committed with jiangxin Jun 6, 2016
Commits on Jun 6, 2016
  1. @jiangxin

    l10n: zh_CN: for git v2.9.0 l10n round 1

    Update 104 new translations (2596t1f0u) for git v2.9.0-rc0.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 29, 2016
Commits on May 31, 2016
  1. @vascool

    l10n: pt_PT: update Portuguese translation

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed May 27, 2016
  2. @vascool

    l10n: pt_PT: update according to git-gui glossary

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed May 27, 2016
  3. @vascool

    l10n: pt_PT: merge git.pot file

    Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
    vascool committed May 28, 2016
Commits on May 29, 2016
  1. @alshopov

    l10n: Updated Bulgarian translation of git (2597t,0f,0u)

    Signed-off-by: Alexander Shopov <ash@kambanaria.org>
    alshopov committed Mar 6, 2016
  2. @jiangxin

    Merge branch 'v2.9.0_rnd1_fr' of git://github.com/jnavila/git

    * 'v2.9.0_rnd1_fr' of git://github.com/jnavila/git:
      l10n: fr.po v2.9.0rnd1
    jiangxin committed May 29, 2016
Commits on May 27, 2016
  1. @nafmo

    l10n: sv.po: Update Swedish translation (2597t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    nafmo committed May 27, 2016
Commits on May 26, 2016
  1. @jnavila

    l10n: fr.po v2.9.0rnd1

    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    jnavila committed May 26, 2016
  2. @jiangxin

    Merge branch 'fix_fr' of git://github.com/jnavila/git

    * 'fix_fr' of git://github.com/jnavila/git:
      l10n: fr.po Fixed grammar mistake
    jiangxin committed May 26, 2016
Commits on May 25, 2016
  1. @vnwildman

    l10n: Updated Vietnamese translation (2597t)

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    vnwildman committed May 25, 2016
Commits on May 24, 2016
  1. @jiangxin

    l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)

    Generate po/git.pot from v2.9.0-rc0 for git v2.9.0 l10n round 1.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed May 24, 2016
Commits on May 23, 2016
  1. @gitster

    Git 2.9-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 23, 2016
  2. @gitster

    Merge branch 'svn-travis' of git://bogomips.org/git-svn

    * 'svn-travis' of git://bogomips.org/git-svn:
      travis-ci: enable Git SVN tests t91xx on Linux
    gitster committed May 23, 2016
  3. @gitster

    Merge branch 'jc/rerere-multi'

    * jc/rerere-multi:
      rerere: remove an null statement
      rerere: plug memory leaks upon "rerere forget" failure
    gitster committed May 23, 2016
  4. @gitster

    Merge branch 'da/difftool'

    "git difftool" learned to handle unmerged paths correctly in
    dir-diff mode.
    
    * da/difftool:
      difftool: handle unmerged files in dir-diff mode
      difftool: initialize variables for readability
    gitster committed May 23, 2016
  5. @gitster

    Merge branch 'jk/test-z-n-unquoted'

    t9xxx series has been updated primarily for readability, while
    fixing small bugs in it.  A few scripted Porcelains have also been
    updated to fix possible bugs around their use of "test -z" and
    "test -n".
    
    * jk/test-z-n-unquoted:
      always quote shell arguments to test -z/-n
      t9103: modernize test style
      t9107: switch inverted single/double quotes in test
      t9107: use "return 1" instead of "exit 1"
      t9100,t3419: enclose all test code in single-quotes
      t/lib-git-svn: drop $remote_git_svn and $git_svn_id
    gitster committed May 23, 2016
  6. @gitster

    Merge branch 'ar/diff-args-osx-precompose'

    Many commands normalize command line arguments from NFD to NFC
    variant of UTF-8 on OSX, but commands in the "diff" family did
    not, causing "git diff $path" to complain that no such path is
    known to Git.  They have been taught to do the normalization.
    
    * ar/diff-args-osx-precompose:
      diff: run arguments through precompose_argv
    gitster committed May 23, 2016
  7. @gitster

    Merge branch 'jc/doc-lint'

    Find common mistakes when writing gitlink: in our documentation and
    drive the check from "make check-docs".
    
    I am not entirely happy with the way the script chooses what input
    file to validate, but it is not worse than not having anything, so
    let's move it forward and have the logic improved later when people
    care about it deeply.
    
    * jc/doc-lint:
      ci: validate "linkgit:" in documentation
    gitster committed May 23, 2016
  8. @gitster

    Merge branch 'js/perf-rebase-i'

    Add perf test for "rebase -i"
    
    * js/perf-rebase-i:
      perf: run "rebase -i" under perf
      perf: make the tests work in worktrees
      perf: let's disable symlinks when they are not available
    gitster committed May 23, 2016
  9. @gitster

    Merge branch 'jc/test-parse-options-expect'

    t0040 had too many unnecessary repetitions in its test data.  Teach
    test-parse-options program so that a caller can tell what it
    expects in its output, so that these repetitions can be cleaned up.
    
    * jc/test-parse-options-expect:
      t0040: convert a few tests to use test-parse-options --expect
      t0040: remove unused test helpers
      test-parse-options: --expect=<string> option to simplify tests
      test-parse-options: fix output when callback option fails
    gitster committed May 23, 2016
  10. @gitster

    Merge branch 'pb/commit-verbose-config'

    "git commit" learned to pay attention to "commit.verbose"
    configuration variable and act as if "--verbose" option was
    given from the command line.
    
    * pb/commit-verbose-config:
      commit: add a commit.verbose config variable
      t7507-commit-verbose: improve test coverage by testing number of diffs
      parse-options.c: make OPTION_COUNTUP respect "unspecified" values
      t/t7507: improve test coverage
      t0040-parse-options: improve test coverage
      test-parse-options: print quiet as integer
      t0040-test-parse-options.sh: fix style issues
    gitster committed May 23, 2016
  11. @gitster

    Merge branch 'xy/format-patch-base'

    "git format-patch" learned a new "--base" option to record what
    (public, well-known) commit the original series was built on in
    its output.
    
    * xy/format-patch-base:
      format-patch: introduce format.useAutoBase configuration
      format-patch: introduce --base=auto option
      format-patch: add '--base' option to record base tree info
      patch-ids: make commit_patch_id() a public helper function
    gitster committed May 23, 2016
  12. @gitster

    Merge branch 'tb/core-eol-fix'

    A couple of bugs around core.autocrlf have been fixed.
    
    * tb/core-eol-fix:
      convert.c: ident + core.autocrlf didn't work
      t0027: test cases for combined attributes
      convert: allow core.autocrlf=input and core.eol=crlf
      t0027: make commit_chk_wrnNNO() reliable
    gitster committed May 23, 2016
  13. @gitster

    Merge branch 'nd/worktree-various-heads'

    The experimental "multiple worktree" feature gains more safety to
    forbid operations on a branch that is checked out or being actively
    worked on elsewhere, by noticing that e.g. it is being rebased.
    
    * nd/worktree-various-heads:
      branch: do not rename a branch under bisect or rebase
      worktree.c: check whether branch is bisected in another worktree
      wt-status.c: split bisect detection out of wt_status_get_state()
      worktree.c: check whether branch is rebased in another worktree
      worktree.c: avoid referencing to worktrees[i] multiple times
      wt-status.c: make wt_status_check_rebase() work on any worktree
      wt-status.c: split rebase detection out of wt_status_get_state()
      path.c: refactor and add worktree_git_path()
      worktree.c: mark current worktree
      worktree.c: make find_shared_symref() return struct worktree *
      worktree.c: store "id" instead of "git_dir"
      path.c: add git_common_path() and strbuf_git_common_path()
      dir.c: rename str(n)cmp_icase to fspath(n)cmp
    gitster committed May 23, 2016
  14. @gitster

    Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'

    "git commit --dry-run" reported "No, no, you cannot commit." in one
    case where "git commit" would have allowed you to commit, and this
    improves it a little bit ("git commit --dry-run --short" still does
    not give you the correct answer, for example).  This is a stop-gap
    measure in that "commit --short --dry-run" still gives an incorrect
    result.
    
    * ss/commit-dry-run-resolve-merge-to-no-op:
      wt-status.c: set commitable bit if there is a meaningful merge.
    gitster committed May 23, 2016
Commits on May 22, 2016
  1. @larsxschneider

    travis-ci: enable Git SVN tests t91xx on Linux

    Install the "git-svn" package to make the Perl SVN libraries available
    to the Git SVN tests on Travis-CI Linux build machines.
    
    Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
    Signed-off-by: Eric Wong <e@80x24.org>
    larsxschneider committed with Eric Wong May 19, 2016
Commits on May 19, 2016
  1. @gitster

    rerere: remove an null statement

    J6t spotted that previous commit added an empty statement by
    mistake.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 19, 2016
Commits on May 18, 2016
  1. @gitster

    Sync with 2.8.3

    * maint:
      Git 2.8.3
    gitster committed May 18, 2016
  2. @gitster

    Git 2.8.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 18, 2016
  3. @gitster

    Merge branch 'jk/push-client-deadlock-fix'

    Some Windows SDK lacks pthread_sigmask() implementation and fails
    to compile the recently updated "git push" codepath that uses it.
    
    * jk/push-client-deadlock-fix:
      Windows: only add a no-op pthread_sigmask() when needed
      Windows: add pthread_sigmask() that does nothing
    gitster committed May 18, 2016
Something went wrong with that request. Please try again.