summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2018-02-15Git 2.16.2v2.16.2Junio C Hamano3-2/+32
2018-02-15Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maintJunio C Hamano1-3/+4
2018-02-15Merge branch 'as/read-tree-prefix-doc-fix' into maintJunio C Hamano1-3/+2
2018-02-15Merge branch 'nd/add-i-ignore-submodules' into maintJunio C Hamano2-1/+49
2018-02-15Merge branch 'tg/stash-with-pathspec-fix' into maintJunio C Hamano2-3/+34
2018-02-15Merge branch 'jk/abort-clone-with-existing-dest' into maintJunio C Hamano2-33/+98
2018-02-15Merge branch 'jc/merge-symlink-ours-theirs' into maintJunio C Hamano2-4/+45
2018-02-15Merge branch 'rs/lose-leak-pending' into maintJunio C Hamano10-86/+46
2018-02-15Merge branch 'jm/svn-pushmergeinfo-fix' into maintJunio C Hamano1-0/+1
2018-02-15Merge branch 'dk/describe-all-output-fix' into maintJunio C Hamano2-3/+10
2018-02-15Merge branch 'ab/perf-grep-threads' into maintJunio C Hamano2-21/+86
2018-01-21Git 2.16.1v2.16.1Junio C Hamano3-2/+13
2018-01-21Merge branch 'bc/hash-algo' into maintJunio C Hamano2-1/+18
2018-01-21t5601-clone: test case-conflicting files on case-insensitive filesystemEric Sunshine1-0/+17
2018-01-19repository: pre-initialize hash algo pointerbrian m. carlson1-1/+1
2018-01-17Git 2.16v2.16.0Junio C Hamano2-3/+6
2018-01-16Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano12-20028/+22202
2018-01-16add--interactive: ignore submodule changes except HEADNguyễn Thái Ngọc Duy2-1/+49
2018-01-15l10n: de.po: translate 72 new messagesRalf Thielow1-1934/+2172
2018-01-15l10n: de.po: improve messages when a branch starts to track another refRalf Thielow1-8/+8
2018-01-12RelNotes: minor typofixSZEDER Gábor1-1/+1
2018-01-11Git 2.16-rc2v2.16.0-rc2Junio C Hamano1-1/+1
2018-01-11Merge branch 'jh/object-filtering'Junio C Hamano1-1/+1
2018-01-11Merge branch 'tg/worktree-create-tracking'Junio C Hamano1-1/+1
2018-01-11Merge branch 'js/test-with-ws-in-path'Junio C Hamano1-4/+4
2018-01-11l10n: bg.po: Updated Bulgarian translation (3288t)Alexander Shopov1-181/+203
2018-01-11Documentation/git-worktree.txt: add missing `Ralf Thielow1-1/+1
2018-01-10cat-file doc: document that -e will return some outputÆvar Arnfjörð Bjarmason1-3/+4
2018-01-10t3900: add some more quotesBeat Bolli1-4/+4
2018-01-10RelNotes update before -rc2Junio C Hamano1-0/+10
2018-01-10Merge branch 'js/perl-path-workaround-in-tests'Junio C Hamano1-1/+16
2018-01-10Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano2-1/+51
2018-01-10Merge branch 'ma/bisect-leakfix'Junio C Hamano1-2/+4
2018-01-10Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano2-3/+20
2018-01-10mingw: handle GITPERLLIB in t0021 in a Windows-compatible wayJohannes Schindelin1-1/+16
2018-01-10l10n: TEAMS: add zh_CN team membersJiang Xin1-0/+1
2018-01-10l10n: zh_CN: for git v2.16.0 l10n round 2Jiang Xin1-1920/+2144
2018-01-10Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-181/+197
2018-01-10Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-1918/+2092
2018-01-09Merge branch 'jk/doc-diff-options'Junio C Hamano1-0/+6
2018-01-09Merge branch 'bw/protocol-v1'Junio C Hamano1-6/+4
2018-01-09Merge branch 'sg/travis-check-untracked'Junio C Hamano4-2/+22
2018-01-09Merge branch 'js/test-with-ws-in-path'Junio C Hamano5-10/+10
2018-01-09Merge branch 'bc/submitting-patches-in-asciidoc'Junio C Hamano1-1/+1
2018-01-09Merge branch 'sg/travis-skip-identical-test'Junio C Hamano6-2/+60
2018-01-09Merge branch 'ab/dc-sha1-loose-ends'Junio C Hamano2-3/+0
2018-01-09Merge branch 'sg/travis-fixes'Junio C Hamano6-1/+22
2018-01-09doc/read-tree: remove obsolete remarkAndreas G. Schacker1-3/+2
2018-01-09l10n: sv.po: Update Swedish translation (3288t0f0u)Peter Krefting1-181/+197
2018-01-09Merge branch 'js/misc-git-gui-stuff' of ../git-guiJunio C Hamano2-1/+27
2018-01-09git-gui: allow Ctrl+T to toggle multiple pathsJohannes Schindelin1-0/+13
2018-01-09git-gui: fix exception when trying to stage with empty file listJohannes Schindelin1-2/+10
2018-01-09git-gui: avoid exception upon Ctrl+T in an empty listJohannes Schindelin1-0/+4
2018-01-09git gui: fix staging a second line to a 1-line fileJohannes Schindelin1-0/+1
2018-01-09Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano2-1/+51
2018-01-09merge-recursive: do not look at the index during recursive mergeJunio C Hamano2-1/+51
2018-01-09l10n: ru.po: update Russian translationDimitriy Ryazantcev1-1918/+2092
2018-01-09l10n: TEAMS: Add ko team membersChangwoo Ryu1-0/+2
2018-01-09Merge branch 'ko/merge-l10n' of https://github.com/git-l10n-ko/git-l10n-koJiang Xin2-1944/+2200
2018-01-08oidset: don't return value from oidset_initThomas Gummerer1-1/+1
2018-01-08stash: don't delete untracked files that match pathspecThomas Gummerer2-3/+34
2018-01-08l10n: ko.po: Update Korean translationChangwoo Ryu2-1944/+2200
2018-01-08Merge branch '2.16' of https://github.com/ChrisADR/git-poJiang Xin1-181/+197
2018-01-08Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/gitJiang Xin1-192/+225
2018-01-07l10n: fr.po 2.16 round 2Jean-Noel Avila1-192/+225
2018-01-07l10n: es.po: Spanish translation 2.16.0 round 2Christopher Díaz Riveros1-181/+197
2018-01-07l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2Tran Ngoc Quan1-1929/+2156
2018-01-07l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)Jiang Xin1-173/+192
2018-01-07Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin8-10292/+11238
2018-01-06Merge branch '2.16' of https://github.com/ChrisADR/git-poJiang Xin1-1920/+2129
2018-01-06Merge branch 'fr_2.16' of git://github.com/jnavila/gitJiang Xin1-1911/+2113
2018-01-05Git 2.16-rc1v2.16.0-rc1Junio C Hamano2-1/+12
2018-01-05Merge branch 'js/sequencer-cleanups'Junio C Hamano2-13/+20
2018-01-05Merge branch 'jh/memihash-opt'Junio C Hamano1-1/+1
2018-01-05Merge branch 'tb/test-lint-wc-l'Junio C Hamano1-0/+1
2018-01-05Merge branch 'rs/use-argv-array-in-child-process'Junio C Hamano2-27/+12
2018-01-05Merge branch 'ld/p4-multiple-shelves'Junio C Hamano3-26/+47
2018-01-05Merge branch 'jd/fix-strbuf-add-urlencode-bytes'Junio C Hamano1-1/+1
2018-01-05Merge branch 'ew/empty-merge-with-dirty-index'Junio C Hamano5-42/+70
2018-01-05Merge branch 'db/doc-config-section-names-with-bs'Junio C Hamano1-5/+7
2018-01-05Merge branch 'jk/test-suite-tracing'Junio C Hamano4-18/+48
2018-01-05rebase -p: fix quoting when calling `git merge`Johannes Schindelin2-3/+20
2018-01-04l10n: es.po: Update Spanish Translation v2.16.0Christopher Díaz Riveros1-1920/+2129
2018-01-04docs/diff-options: clarify scope of diff-filter typesJeff King1-0/+6
2018-01-04http: fix v1 protocol tests with apache httpd < 2.4Todd Zullinger1-6/+4
2018-01-04perf: amend the grep tests to test grep.threadsÆvar Arnfjörð Bjarmason2-21/+86
2018-01-03t0302 & t3900: add forgotten quotesJohannes Schindelin2-5/+5
2018-01-03Allow the test suite to pass in a directory whose name contains spacesJohannes Schindelin3-5/+5
2018-01-03bisect: fix a regression causing a segfaultÆvar Arnfjörð Bjarmason1-2/+4
2018-01-03doc/SubmittingPatches: improve text formattingTodd Zullinger1-1/+1
2018-01-03clone: do not clean up directories we didn't createJeff King2-9/+67
2018-01-03clone: factor out dir_exists() helperJeff King1-3/+8
2018-01-03t5600: modernize styleJeff King1-23/+25
2018-01-03t5600: fix outdated comment about unborn HEADJeff King1-1/+1
2018-01-03travis-ci: check that all build artifacts are .gitignore-dSZEDER Gábor4-0/+20
2018-01-03travis-ci: don't store P4 and Git LFS in the working treeSZEDER Gábor1-2/+2
2018-01-03merge: teach -Xours/-Xtheirs to symbolic link mergeJunio C Hamano2-4/+45
2018-01-02l10n: fr.po v2.16.0 round 1Jean-Noel Avila1-1910/+2112
2018-01-02travis-ci: record and skip successfully built treesSZEDER Gábor6-0/+57
2018-01-02travis-ci: create the cache directory early in the build processSZEDER Gábor2-1/+2
2018-01-02travis-ci: print the "tip of branch is exactly at tag" message in colorSZEDER Gábor1-1/+1
2018-01-02Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-1934/+2106
2018-01-01l10n: bg.po: Updated Bulgarian translation (3284t)Alexander Shopov1-1934/+2106
2018-01-01l10n: sv.po: Update Swedish translation (3284t0f0u)Peter Krefting1-1910/+2118
2017-12-31l10n: fr.po: "worktree list" mistranslated as pruneLouis Bettens1-1/+1
2017-12-31Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin4-745/+746
2017-12-31l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)Jiang Xin1-1885/+2039
2017-12-28Git 2.16-rc0v2.16.0-rc0Junio C Hamano2-1/+32
2017-12-28Merge branch 'sb/describe-blob'Junio C Hamano8-52/+277
2017-12-28Merge branch 'hi/merge-verify-sig-config'Junio C Hamano4-0/+132
2017-12-28Merge branch 'ws/curl-http-proxy-over-https'Junio C Hamano1-0/+5
2017-12-28Merge branch 'ks/doc-previous-checkout'Junio C Hamano1-7/+12
2017-12-28Merge branch 'ks/rebase-error-messages'Junio C Hamano1-10/+25
2017-12-28Merge branch 'sr/http-sslverify-config-doc'Junio C Hamano1-2/+2
2017-12-28Merge branch 'nm/imap-send-quote-server-folder-name'Junio C Hamano1-1/+7
2017-12-28Merge branch 'bp/fsmonitor'Junio C Hamano1-2/+1
2017-12-28Merge branch 'jh/partial-clone-doc'Junio C Hamano1-0/+324
2017-12-28Merge branch 'jt/transport-hide-vtable'Junio C Hamano6-93/+120
2017-12-28Merge branch 'js/enhanced-version-info'Junio C Hamano4-1/+20
2017-12-28Merge branch 'tz/lib-git-svn-svnserve-tests'Junio C Hamano1-11/+13
2017-12-28Merge branch 'ew/svn-crlf'Junio C Hamano2-0/+28
2017-12-28Merge branch 'cc/skip-to-optional-val'Junio C Hamano5-90/+126
2017-12-28Merge branch 'ra/prompt-eread-fix'Junio C Hamano1-3/+4
2017-12-28Merge branch 'bw/path-doc'Junio C Hamano1-21/+112
2017-12-28commit: remove unused function clear_commit_marks_for_object_array()René Scharfe2-15/+0
2017-12-28revision: remove the unused flag leak_pendingRené Scharfe2-14/+1
2017-12-28checkout: avoid using the rev_info flag leak_pendingRené Scharfe1-12/+1
2017-12-28bundle: avoid using the rev_info flag leak_pendingRené Scharfe1-19/+16
2017-12-28bisect: avoid using the rev_info flag leak_pendingRené Scharfe1-21/+9
2017-12-28object: add clear_commit_marks_all()René Scharfe2-0/+16
2017-12-28ref-filter: use clear_commit_marks_many() in do_merge_filter()René Scharfe1-2/+1
2017-12-28commit: use clear_commit_marks_many() in remove_redundant()René Scharfe1-2/+1
2017-12-28commit: avoid allocation in clear_commit_marks_many()René Scharfe1-1/+1
2017-12-28Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1Ævar Arnfjörð Bjarmason2-3/+0
2017-12-27sequencer: do not invent whitespace when transforming OIDsJohannes Schindelin1-1/+4
2017-12-27sequencer: report when noop has an argumentJohannes Schindelin1-4/+9
2017-12-27sequencer: remove superfluous conditionalJohannes Schindelin1-3/+1
2017-12-27sequencer: strip bogus LF at end of error messagesJohannes Schindelin1-4/+4
2017-12-27rebase: do not continue when the todo list generation failedJohannes Schindelin1-1/+2
2017-12-27travis-ci: only print test failures if there are test results availableSZEDER Gábor1-0/+6
2017-12-27travis-ci: save prove state for the 32 bit Linux buildSZEDER Gábor2-0/+2
2017-12-27travis-ci: don't install default addon packages for the 32 bit Linux buildSZEDER Gábor1-0/+1
2017-12-27travis-ci: fine tune the use of 'set -x' in 'ci/*' scriptsSZEDER Gábor4-1/+13
2017-12-27RelNotes: the eleventh batchJunio C Hamano1-0/+41
2017-12-27Merge branch 'rb/quick-install-doc'Junio C Hamano2-6/+8
2017-12-27Merge branch 'jt/transport-no-more-rsync'Junio C Hamano2-9/+1
2017-12-27Merge branch 'sg/travis-fixes'Junio C Hamano3-29/+39
2017-12-27Merge branch 'sb/test-helper-excludes'Junio C Hamano1-41/+5
2017-12-27Merge branch 'ot/pretty'Junio C Hamano6-84/+136
2017-12-27Merge branch 'bw/submodule-sans-cache-compat'Junio C Hamano5-23/+31
2017-12-27Merge branch 'es/clone-shared-worktree'Junio C Hamano2-1/+8
2017-12-27Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano1-5/+7
2017-12-27Merge branch 'rs/fmt-merge-msg-leakfix'Junio C Hamano1-2/+5
2017-12-27Merge branch 'jt/decorate-api'Junio C Hamano8-25/+146
2017-12-27Merge branch 'jk/cvsimport-quoting'Junio C Hamano1-1/+1
2017-12-27Merge branch 'db/doc-workflows-neuter-the-maintainer'Junio C Hamano1-2/+2
2017-12-27Merge branch 'ks/branch-cleanup'Junio C Hamano4-11/+24
2017-12-27Merge branch 'rs/strbuf-read-once-reset-length'Junio C Hamano1-0/+3
2017-12-27Merge branch 'rs/fmt-merge-msg-string-leak-fix'Junio C Hamano1-1/+2
2017-12-27Merge branch 'rs/am-builtin-leakfix'Junio C Hamano1-3/+7
2017-12-27Merge branch 'es/worktree-checkout-hook'Junio C Hamano3-7/+47
2017-12-27Merge branch 'lb/rebase-i-short-command-names'Junio C Hamano8-126/+186
2017-12-27Merge branch 'tb/check-crlf-for-safe-crlf'Junio C Hamano2-10/+86
2017-12-27Merge branch 'jh/object-filtering'Junio C Hamano20-53/+1735
2017-12-27sequencer.c: drop 'const' from function return typeJunio C Hamano1-1/+1
2017-12-27describe: prepend "tags/" when describing tags with embedded nameDaniel Knittl-Frank2-3/+10
2017-12-22strbuf: fix urlencode format string on signed charJulien Dusser1-1/+1
2017-12-22send-pack: use internal argv_array of struct child_processRené Scharfe1-19/+9
2017-12-22http: use internal argv_array of struct child_processRené Scharfe1-8/+3
2017-12-22git-p4: update multiple shelved change listsLuke Diamand3-26/+47
2017-12-22check-non-portable-shell.pl: `wc -l` may have leading WSTorsten Bögershausen1-0/+1
2017-12-22config.txt: document behavior of backslashes in subsectionsDave Borowitz1-5/+7
2017-12-22Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...Junio C Hamano5-42/+70
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren2-1/+8
2017-12-22move index_has_changes() from builtin/am.c to merge.c for reuseElijah Newren3-37/+42
2017-12-22t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren1-5/+21
2017-12-22t/helper/test-lazy-name-hash: fix compilationStefan Beller1-1/+1
2017-12-19t5573, t7612: clean up after unexpected success of 'pull' and 'merge'Junio C Hamano2-8/+17
2017-12-19RelNotes: the tenth batchJunio C Hamano1-0/+46
2017-12-19Merge branch 'ls/editor-waiting-message'Junio C Hamano7-7/+41
2017-12-19Merge branch 'sg/setup-doc-update'Junio C Hamano1-1/+1
2017-12-19Merge branch 'ar/unconfuse-three-dots'Junio C Hamano25-24/+458
2017-12-19Merge branch 'tg/worktree-create-tracking'Junio C Hamano8-51/+277
2017-12-19Merge branch 'gk/tracing-optimization'Junio C Hamano2-40/+48
2017-12-19Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2-0/+19
2017-12-19Merge branch 'sb/clone-recursive-submodule-doc'Junio C Hamano1-8/+11
2017-12-19Merge branch 'ls/git-gui-no-double-utf8-author-name'Junio C Hamano1-3/+9
2017-12-19Merge branch 'bw/pathspec-match-submodule-boundary'Junio C Hamano4-2/+24
2017-12-19Merge branch 'jt/diff-anchored-patience'Junio C Hamano6-7/+169
2017-12-19Merge branch 'en/merge-recursive-icase-removal'Junio C Hamano1-1/+1
2017-12-19Merge branch 'en/rename-progress'Junio C Hamano6-27/+44
2017-12-19builtin/describe.c: describe a blobStefan Beller3-7/+107
2017-12-19http: support CURLPROXY_HTTPSWei Shuyu1-0/+5
2017-12-19rebase: rebasing can also be done when HEAD is detachedKaartic Sivaraam1-2/+14
2017-12-19rebase: distinguish user input by quoting itKaartic Sivaraam1-2/+2
2017-12-19rebase: consistently use branch_name variableKaartic Sivaraam1-7/+10
2017-12-19Doc/check-ref-format: clarify information about @{-N} syntaxKaartic Sivaraam1-7/+12
2017-12-18config: document default value of http.sslVerifySimon Ruderich1-2/+2
2017-12-18p7519: improve check for prerequisite WATCHMANRené Scharfe1-2/+1
2017-12-18imap-send: URI encode server folderNicolas Morey-Chaisemartin1-1/+7