summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-11-29Git 2.11v2.11.0Junio C Hamano2-1/+6
2016-11-29Merge branch 'jk/common-main'Junio C Hamano4-9/+10
2016-11-29Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2-4189/+5888
2016-11-29common-main: stop munging argv[0] pathJeff King4-9/+10
2016-11-29Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-2066/+2868
2016-11-29l10n: ru.po: update Russian translationDimitriy Ryazantcev1-2066/+2868
2016-11-28l10n: ca.po: update translationAlex Henrie1-2123/+3020
2016-11-28RelNotes: spelling and phrasing fixupsMarc Branchaud1-76/+72
2016-11-28Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano8-2193/+3167
2016-11-28l10n: de.po: translate 210 new messagesRalf Thielow1-2111/+3085
2016-11-25l10n: fix unmatched single quote in error messageJiang Xin7-82/+82
2016-11-23Git 2.11-rc3v2.11.0-rc3Junio C Hamano2-1/+10
2016-11-23Merge branch 'jc/setup-cleanup-fix'Junio C Hamano8-20/+69
2016-11-23Merge branch 'jt/trailer-with-cruft'Junio C Hamano1-1/+2
2016-11-23Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano4-3/+34
2016-11-23Merge branch 'jc/for-each-ref-head-segfault-fix'Junio C Hamano2-1/+11
2016-11-22Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano8-16103/+23112
2016-11-22Merge branch 'js/prepare-sequencer'Junio C Hamano1-1/+1
2016-11-22archive: read local configurationJunio C Hamano6-15/+40
2016-11-22mailinfo: read local configurationJunio C Hamano3-5/+29
2016-11-22l10n: Fixed typo of git fetch-pack commandJiang Xin6-183/+282
2016-11-22l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)Jiang Xin1-9/+9
2016-11-22Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin8-16066/+22976
2016-11-21doc: mention user-configured trailersJonathan Tan1-1/+2
2016-11-21rebase -i: handle core.commentChar=autoJohannes Schindelin2-3/+12
2016-11-21stripspace: respect repository configJohannes Schindelin2-2/+4
2016-11-21rebase -i: highlight problems with core.commentcharJohannes Schindelin2-0/+20
2016-11-21i18n: fix unmatched single quote in error messageJiang Xin1-1/+1
2016-11-21l10n: zh_CN: for git v2.11.0 l10n round 1Jiang Xin1-2002/+2897
2016-11-18for-each-ref: do not segv with %(HEAD) on an unborn branchJunio C Hamano2-1/+11
2016-11-17Git 2.11-rc2v2.11.0-rc2Junio C Hamano2-1/+4
2016-11-17Merge branch 'tk/diffcore-delta-remove-unused'Junio C Hamano5-8/+1
2016-11-17Merge branch 'jk/create-branch-remove-unused-param'Junio C Hamano4-13/+18
2016-11-17Merge branch 'nd/worktree-lock'Junio C Hamano1-1/+1
2016-11-14diffcore-delta: remove unused parameter to diffcore_count_changes()Tobias Klauser5-8/+1
2016-11-13git-worktree.txt: fix typo "to"/"two", and add commaBen North1-1/+1
2016-11-13l10n: pt_PT: update Portuguese translationVasco Almeida1-2027/+2947
2016-11-11Git 2.11.0-rc1v2.11.0-rc1Junio C Hamano1-0/+7
2016-11-11Merge branch 'rt/fetch-pack-error-message-fix'Junio C Hamano1-1/+1
2016-11-11Merge branch 'ps/common-info-doc'Junio C Hamano1-1/+1
2016-11-11Merge branch 'js/pwd-var-vs-pwd-cmd-fix'Junio C Hamano2-3/+3
2016-11-11Merge branch 'ls/macos-update'Junio C Hamano2-1/+3
2016-11-11Merge branch 'js/prepare-sequencer'Junio C Hamano1-1/+1
2016-11-11Merge branch 'ls/filter-process'Junio C Hamano1-2/+1
2016-11-11Merge branch 'as/merge-attr-sleep'Junio C Hamano1-5/+13
2016-11-11fetch-pack.c: correct command at the beginning of an error messageRalf Thielow1-1/+1
2016-11-11t0021: remove debugging cruftJunio C Hamano1-2/+1
2016-11-11t6026: clarify the point of "kill $(cat sleep.pid)"Johannes Sixt1-1/+9
2016-11-11t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variablesJohannes Sixt2-3/+3
2016-11-11doc: fix location of 'info/' with $GIT_COMMON_DIRPatrick Steinhardt1-1/+1
2016-11-10t6026: ensure that long-running script really isJohannes Schindelin1-4/+4
2016-11-10Revert "t6026-merge-attr: don't fail if sleep exits early"Junio C Hamano1-1/+1
2016-11-10Revert "t6026-merge-attr: ensure that the merge driver was called"Junio C Hamano1-2/+1
2016-11-10Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2-1/+72
2016-11-10Merge branch 'jk/filter-process-fix'Junio C Hamano2-15/+17
2016-11-10Merge branch 'ls/filter-process'Junio C Hamano1-5/+4
2016-11-10t6026-merge-attr: ensure that the merge driver was calledAndreas Schwab1-1/+2
2016-11-10travis-ci: disable GIT_TEST_HTTPD for macOSLars Schneider1-1/+2
2016-11-10Makefile: set NO_OPENSSL on macOS by defaultLars Schneider1-0/+1
2016-11-09create_branch: drop unused "head" parameterJeff King4-13/+18
2016-11-09Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/gitJiang Xin1-2047/+2922
2016-11-08sequencer: silence -Wtautological-constant-out-of-range-compareJeff King1-1/+1
2016-11-08t6026-merge-attr: don't fail if sleep exits earlyAndreas Schwab1-1/+1
2016-11-08alternates: re-allow relative paths from environmentJeff King2-1/+72
2016-11-08t0021: compute file size with a single process instead of a pipelineJohannes Sixt1-1/+1
2016-11-08t0021: expect more variations in the output of uniq -cJohannes Sixt1-4/+3
2016-11-06l10n: fr.po fix grammar mistakesjfbu1-11/+7
2016-11-05l10n: fr.po v2.11.0_rnd1Jean-Noel Avila1-2037/+2916
2016-11-05l10n: sv.po: Update Swedish translation (2913t0f0u)Peter Krefting1-2019/+2936
2016-11-05Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin1-2230/+2946
2016-11-04l10n: vi.po: Updated translation to v2.11.0 (2913t)Tran Ngoc Quan1-2016/+2930
2016-11-04l10n: ko.po: Update Korean translationChangwoo Ryu1-2230/+2946
2016-11-02t0021: fix filehandle usage on older perlJeff King1-0/+1
2016-11-02t0021: use $PERL_PATH for rot13-filter.plJeff King2-9/+11
2016-11-02t0021: put $TEST_ROOT in $PATHJeff King1-3/+4
2016-11-02t0021: use write_script to create rot13 shell scriptJeff King1-3/+1
2016-11-02Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-1773/+2656
2016-11-01A bit of updates post -rc0Junio C Hamano1-7/+8
2016-11-01Merge branch 'cc/split-index-typofix'Junio C Hamano1-1/+1
2016-11-01Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano1-1/+2
2016-11-01Merge branch 'rs/cocci'Junio C Hamano1-0/+15
2016-11-01split-index: s/eith/with/ typo fixChristian Couder1-1/+1
2016-11-01cocci: avoid self-references in object_id transformationsRené Scharfe1-0/+15
2016-11-01sha1_name: make wraparound of the index into ring-buffer explicitRené Scharfe1-1/+2
2016-11-01l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)Jiang Xin1-1952/+2742
2016-10-31Git 2.11-rc0v2.11.0-rc0Junio C Hamano2-28/+42
2016-10-31Merge branch 'nd/test-helpers'Junio C Hamano2-3/+18
2016-10-31Merge branch 'sc/fmt-merge-msg-doc-markup-fix'Junio C Hamano1-2/+2
2016-10-31Merge branch 'ak/sh-setup-dot-source-i18n-fix'Junio C Hamano1-3/+3
2016-10-31Merge branch 'rs/commit-pptr-simplify'Junio C Hamano1-8/+6
2016-10-31Merge branch 'jk/rebase-config-insn-fmt-docfix'Junio C Hamano1-1/+1
2016-10-31Merge branch 'ak/pre-receive-hook-template-modefix'Junio C Hamano1-0/+0
2016-10-31Merge branch 'jk/common-main'Junio C Hamano1-2/+2
2016-10-31Merge branch 'aw/numbered-stash'Junio C Hamano3-3/+50
2016-10-31Merge branch 'jt/trailer-with-cruft'Junio C Hamano3-279/+654
2016-10-31Merge branch 'ls/filter-process'Junio C Hamano19-135/+1498
2016-10-31Merge branch 'ls/git-open-cloexec'Junio C Hamano5-14/+26
2016-10-30git-sh-setup: be explicit where to dot-source git-sh-i18n from.Anders Kaseorg1-3/+3
2016-10-30commit: simplify building parents listRené Scharfe1-8/+6
2016-10-30doc: fix missing "::" in config listJeff King1-1/+1
2016-10-28pre-receive.sample: mark it executableAnders Kaseorg1-0/+0
2016-10-28Sync with 2.10.2Junio C Hamano2-1/+68
2016-10-28Git 2.10.2v2.10.2Junio C Hamano3-2/+69
2016-10-28Merge branch 'pb/test-parse-options-expect' into maintJunio C Hamano1-170/+13
2016-10-28Merge branch 'jc/cocci-xstrdup-or-null' into maintJunio C Hamano7-20/+17
2016-10-28Merge branch 'rs/cocci' into maintJunio C Hamano15-45/+99
2016-10-28Merge branch 'jc/diff-unique-abbrev-comments' into maintJunio C Hamano1-1/+22
2016-10-28Merge branch 'rs/pretty-format-color-doc-fix' into maintJunio C Hamano1-1/+2
2016-10-28Merge branch 'js/reset-usage' into maintJunio C Hamano1-1/+1
2016-10-28Merge branch 'po/fix-doc-merge-base-illustration' into maintJunio C Hamano2-21/+21
2016-10-28Merge branch 'jk/tap-verbose-fix' into maintJunio C Hamano3-5/+37
2016-10-28Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano1-0/+1
2016-10-28Merge branch 'bw/submodule-branch-dot-doc' into maintJunio C Hamano2-3/+8
2016-10-28Merge branch 'jk/tighten-alloc' into maintJunio C Hamano1-11/+6
2016-10-28Merge branch 'jk/fetch-quick-tag-following' into maintJunio C Hamano4-4/+112
2016-10-28Merge branch 'jk/merge-base-fork-point-without-reflog' into maintJunio C Hamano2-0/+9
2016-10-28Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok' into maintJunio C Hamano2-0/+10
2016-10-28Merge branch 'sb/submodule-config-doc-drop-path' into maintJunio C Hamano1-5/+6
2016-10-28Merge branch 'jk/ref-symlink-loop' into maintJunio C Hamano2-1/+18
2016-10-28Merge branch 'nd/commit-p-doc' into maintJunio C Hamano1-2/+4
2016-10-28Merge branch 'jk/clone-copy-alternates-fix' into maintJunio C Hamano1-2/+5
2016-10-28Merge branch 'dt/http-empty-auth' into maintJunio C Hamano1-1/+1
2016-10-28Merge branch 'dp/autoconf-curl-ssl' into maintJunio C Hamano1-10/+11
2016-10-28Merge branch 'ak/curl-imap-send-explicit-scheme' into maintJunio C Hamano1-0/+1
2016-10-28Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' into maintJunio C Hamano1-2/+9
2016-10-28Merge branch 'js/regexec-buf' into maintJunio C Hamano1-6/+7
2016-10-28Merge branch 'rs/c-auto-resets-attributes' into maintJunio C Hamano1-0/+2
2016-10-28Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maintJunio C Hamano1-3/+2
2016-10-28Documentation/fmt-merge-msg: fix markup in exampleStefan Christ1-2/+2
2016-10-27valgrind: support test helpersRené Scharfe2-3/+18
2016-10-27Getting ready for 2.11-rc0Junio C Hamano1-1/+36
2016-10-27Merge branch 'svn-cache' of git://bogomips.org/git-svnJunio C Hamano1-1/+11
2016-10-27Merge branch 'svn-wt' of git://bogomips.org/git-svnJunio C Hamano6-48/+69
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano9-13/+89
2016-10-27Merge branch 'js/prepare-sequencer'Junio C Hamano5-261/+492
2016-10-27Merge branch 'jk/daemon-path-ok-check-truncation'Junio C Hamano1-4/+21
2016-10-27Merge branch 'rs/ring-buffer-wraparound'Junio C Hamano2-2/+4
2016-10-27Merge branch 'sb/submodule-ignore-trailing-slash'Junio C Hamano2-15/+22
2016-10-27Merge branch 'jk/no-looking-at-dotgit-outside-repo'Junio C Hamano11-46/+66
2016-10-27Merge branch 'jc/abbrev-auto'Junio C Hamano3-42/+81
2016-10-27Merge branch 'jk/abbrev-auto'Junio C Hamano3-26/+68
2016-10-27Merge branch 'lt/abbrev-auto'Junio C Hamano7-7/+40
2016-10-27git-svn: do not reuse caches memoized for a different architectureGavin Lambert1-1/+11
2016-10-27git-compat-util: move content inside ifdef/endif guardsJeff King1-2/+2
2016-10-26diff: handle sha1 abbreviations outside of repositoryJeff King1-4/+17
2016-10-26diff_aligned_abbrev: use "struct oid"Jeff King3-12/+14
2016-10-26diff_unique_abbrev: rename to diff_aligned_abbrevJeff King3-11/+11
2016-10-26find_unique_abbrev: use 4-buffer ringJeff King4-19/+16
2016-10-26test-*-cache-tree: setup git dirJeff King2-0/+2
2016-10-26read info/{attributes,exclude} only when in repositoryJeff King2-7/+11
2016-10-26Eleventh batch for 2.11Junio C Hamano1-0/+106
2016-10-26Merge branch 'ex/deprecate-empty-pathspec-as-match-all'Junio C Hamano3-2/+19
2016-10-26Merge branch 'po/fix-doc-merge-base-illustration'Junio C Hamano2-21/+21
2016-10-26Merge branch 'jk/tap-verbose-fix'Junio C Hamano3-5/+37
2016-10-26Merge branch 'mm/send-email-cc-cruft-after-address'Junio C Hamano3-10/+42
2016-10-26Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc'Junio C Hamano1-3/+2
2016-10-26Merge branch 'pt/gitgui-updates'Junio C Hamano26-1923/+1982
2016-10-26Merge branch 'jk/diff-submodule-diff-inline'Junio C Hamano2-1/+15
2016-10-26Merge branch 'tg/add-chmod+x-fix'Junio C Hamano1-0/+1
2016-10-26Merge branch 'bw/submodule-branch-dot-doc'Junio C Hamano2-3/+8
2016-10-26Merge branch 'pb/test-parse-options-expect'Junio C Hamano1-170/+13
2016-10-26Merge branch 'jk/tighten-alloc'Junio C Hamano1-11/+6
2016-10-26Merge branch 'va/i18n'Junio C Hamano6-50/+60
2016-10-26Merge branch 'jk/fetch-quick-tag-following'Junio C Hamano4-4/+112
2016-10-26Merge branch 'jk/merge-base-fork-point-without-reflog'Junio C Hamano2-0/+9
2016-10-26Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano1-1/+1
2016-10-26Merge branch 'jk/upload-pack-use-prio-queue'Junio C Hamano1-6/+7
2016-10-26Merge branch 'ab/gitweb-abbrev-links'Junio C Hamano1-3/+17
2016-10-26Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'Junio C Hamano2-0/+10
2016-10-26Merge branch 'mg/gpg-richer-status'Junio C Hamano4-6/+34
2016-10-26Merge branch 'jc/cocci-xstrdup-or-null'Junio C Hamano7-20/+17
2016-10-26Merge branch 'mm/credential-libsecret'Junio C Hamano2-0/+395
2016-10-26Merge branch 'bw/ls-files-recurse-submodules'Junio C Hamano9-44/+452
2016-10-26Merge branch 'js/libify-require-clean-work-tree'Junio C Hamano3-68/+87
2016-10-26Merge branch 'jc/ws-error-highlight'Junio C Hamano4-52/+119
2016-10-26Merge branch 'jc/diff-unique-abbrev-comments'Junio C Hamano1-1/+22
2016-10-26hex: make wraparound of the index into ring-buffer explicitRené Scharfe2-2/+4
2016-10-26stash: allow stashes to be referenced by index onlyAaron M Watson3-3/+50
2016-10-25t0060: sidestep surprising path mangling results on WindowsJohannes Sixt1-13/+14
2016-10-25read-cache: make sure file handles are not inherited by child processesLars Schneider1-1/+8
2016-10-25sha1_file: open window into packfiles with O_CLOEXECLars Schneider1-4/+9
2016-10-25sha1_file: rename git_open_noatime() to git_open()Lars Schneider4-9/+9
2016-10-24doc: fix the 'revert a faulty merge' ASCII art tab spacingPhilip Oakley1-8/+8
2016-10-24commit: don't be fooled by ita entries when creating initial commitNguyễn Thái Ngọc Duy2-3/+18
2016-10-24commit: fix empty commit creation when there's no changes but ita entriesNguyễn Thái Ngọc Duy5-5/+18
2016-10-24diff: add --ita-[in]visible-in-indexNguyễn Thái Ngọc Duy3-1/+15
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy5-4/+38
2016-10-24daemon: detect and reject too-long pathsJeff King1-4/+21
2016-10-24test-lib: bail out when "-v" used under "prove"Jeff King1-0/+10
2016-10-22transport: compute summary-width dynamicallyJunio C Hamano1-1/+17
2016-10-21transport: allow summary-width to be computed dynamicallyJunio C Hamano3-4/+9
2016-10-21fetch: pass summary_width down the callchainJunio C Hamano1-16/+21
2016-10-21transport: pass summary_width down the callchainJunio C Hamano1-25/+38
2016-10-21trailer: support values folded to multiple linesJonathan Tan3-10/+211
2016-10-21trailer: forbid leading whitespace in trailersJonathan Tan3-2/+17
2016-10-21trailer: allow non-trailers in trailer blockJonathan Tan3-15/+194
2016-10-21trailer: clarify failure modes in parse_trailerJonathan Tan1-22/+53
2016-10-21travis: use --verbose-log test optionJeff King1-1/+1
2016-10-21test-lib: add --verbose-log optionJeff King2-3/+25
2016-10-21test-lib: handle TEST_OUTPUT_DIRECTORY with spacesJeff King1-2/+2