summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2016-05-23Git 2.9-rc0v2.9.0-rc0Junio C Hamano2-29/+50
2016-05-23Merge branch 'svn-travis' of git://bogomips.org/git-svnJunio C Hamano1-0/+1
2016-05-23Merge branch 'jc/rerere-multi'Junio C Hamano1-8/+17
2016-05-23Merge branch 'da/difftool'Junio C Hamano2-2/+30
2016-05-23Merge branch 'jk/test-z-n-unquoted'Junio C Hamano15-115/+125
2016-05-23Merge branch 'ar/diff-args-osx-precompose'Junio C Hamano5-0/+47
2016-05-23Merge branch 'jc/doc-lint'Junio C Hamano3-0/+76
2016-05-23Merge branch 'js/perf-rebase-i'Junio C Hamano2-8/+47
2016-05-23Merge branch 'jc/test-parse-options-expect'Junio C Hamano2-60/+93
2016-05-23Merge branch 'pb/commit-verbose-config'Junio C Hamano8-74/+268
2016-05-23Merge branch 'xy/format-patch-base'Junio C Hamano6-1/+340
2016-05-23Merge branch 'tb/core-eol-fix'Junio C Hamano4-189/+141
2016-05-23Merge branch 'nd/worktree-various-heads'Junio C Hamano17-82/+344
2016-05-23Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2-0/+21
2016-05-22travis-ci: enable Git SVN tests t91xx on LinuxLars Schneider1-0/+1
2016-05-19rerere: remove an null statementJunio C Hamano1-1/+1
2016-05-18Sync with 2.8.3Junio C Hamano2-3/+35
2016-05-18Git 2.8.3v2.8.3Junio C Hamano4-5/+37
2016-05-18Merge branch 'jk/push-client-deadlock-fix'Junio C Hamano2-0/+8
2016-05-18Merge branch 'sb/misc-cleanups' into HEADJunio C Hamano6-21/+29
2016-05-18Merge branch 'ew/doc-split-pack-disables-bitmap' into HEADJunio C Hamano4-9/+23
2016-05-18Merge branch 'sb/clean-test-fix' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'rn/glossary-typofix' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'ew/normal-to-e' into HEADJunio C Hamano1-0/+1
2016-05-18Merge branch 'sb/config-exit-status-list' into HEADJunio C Hamano1-3/+3
2016-05-18Merge branch 'rt/string-list-lookup-cleanup' into HEADJunio C Hamano1-4/+4
2016-05-18Merge branch 'jk/fix-attribute-macro-in-2.5' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'sg/test-lib-simplify-expr-away' into HEADJunio C Hamano1-5/+5
2016-05-18Merge branch 'nd/remove-unused' into HEADJunio C Hamano4-27/+0
2016-05-18Merge branch 'sk/gitweb-highlight-encoding' into HEADJunio C Hamano1-0/+3
2016-05-18Merge branch 'ls/travis-submitting-patches' into HEADJunio C Hamano1-17/+63
2016-05-18Merge branch 'js/close-packs-before-gc' into HEADJunio C Hamano1-0/+1
2016-05-18Merge branch 'ls/p4-lfs' into HEADJunio C Hamano3-10/+24
2016-05-18Merge branch 'ls/p4-lfs-test-fix-2.7.0' into HEADJunio C Hamano1-1/+1
2016-05-18Merge branch 'nf/mergetool-prompt' into HEADJunio C Hamano4-5/+5
2016-05-18Merge branch 'jd/send-email-to-whom' into HEADJunio C Hamano1-2/+3
2016-05-18Merge branch 'js/win32-mmap' into HEADJunio C Hamano1-13/+18
2016-05-18Merge branch 'jk/push-client-deadlock-fix' into HEADJunio C Hamano7-11/+29
2016-05-18Merge branch 'sb/mv-submodule-fix' into HEADJunio C Hamano2-9/+28
2016-05-18Merge branch 'da/user-useconfigonly' into HEADJunio C Hamano1-6/+10
2016-05-18Merge branch 'ld/p4-test-py3' into HEADJunio C Hamano2-6/+7
2016-05-17Thirteenth batch for 2.9Junio C Hamano1-6/+78
2016-05-17Merge branch 'kf/gpg-sig-verification-doc'Junio C Hamano2-4/+7
2016-05-17Merge branch 'js/windows-dotgit'Junio C Hamano8-3/+147
2016-05-17Merge branch 'va/mailinfo-doc-typofix'Junio C Hamano1-1/+1
2016-05-17Merge branch 'jk/test-send-sh-x-trace-elsewhere'Junio C Hamano2-3/+16
2016-05-17Merge branch 'js/http-custom-headers'Junio C Hamano2-6/+24
2016-05-17Merge branch 'jk/rebase-interative-eval-fix'Junio C Hamano1-0/+1
2016-05-17Merge branch 'jc/fsck-nul-in-commit'Junio C Hamano2-3/+31
2016-05-17Merge branch 'nd/test-helpers'Junio C Hamano1-0/+1
2016-05-17Merge branch 'ls/travis-build-doc'Junio C Hamano2-0/+29
2016-05-17Merge branch 'jc/ll-merge-internal'Junio C Hamano3-88/+12
2016-05-17Merge branch 'jc/linkgit-fix'Junio C Hamano8-10/+10
2016-05-17Merge branch 'va/i18n-remote-comment-to-align'Junio C Hamano1-0/+2
2016-05-17Merge branch 'tb/t5601-sed-fix'Junio C Hamano1-1/+1
2016-05-17Merge branch 'nd/error-errno'Junio C Hamano44-173/+160
2016-05-17Merge branch 'jc/test-seq'Junio C Hamano1-15/+13
2016-05-17Merge branch 'es/test-gpg-tags'Junio C Hamano1-23/+22
2016-05-17Merge branch 'ak/t4151-ls-files-could-be-empty'Junio C Hamano1-1/+1
2016-05-17Merge branch 'jk/submodule-c-credential'Junio C Hamano6-103/+63
2016-05-17Merge branch 'nd/remote-plural-ours-plus-theirs'Junio C Hamano1-1/+1
2016-05-17Merge branch 'bn/config-doc-tt-varnames'Junio C Hamano1-11/+11
2016-05-17Merge branch 'va/i18n-misc-updates'Junio C Hamano8-61/+111
2016-05-17Merge branch 'js/t3404-typofix'Junio C Hamano1-1/+1
2016-05-17Merge branch 'sb/z-is-gnutar-ism'Junio C Hamano2-4/+4
2016-05-17Merge branch 'lp/typofixes'Junio C Hamano12-14/+14
2016-05-17Merge branch 'sb/submodule-deinit-all'Junio C Hamano3-10/+48
2016-05-17Merge branch 'jc/config-pathname-type'Junio C Hamano1-11/+19
2016-05-17Merge branch 'bn/http-cookiefile-config'Junio C Hamano2-3/+4
2016-05-17Merge branch 'ab/hooks'Junio C Hamano8-32/+112
2016-05-17Merge branch 'sb/submodule-init'Junio C Hamano7-141/+461
2016-05-16difftool: handle unmerged files in dir-diff modeDavid Aguilar2-0/+28
2016-05-16difftool: initialize variables for readabilityDavid Aguilar1-2/+2
2016-05-14always quote shell arguments to test -z/-nJeff King3-5/+5
2016-05-14t9103: modernize test styleJeff King1-10/+12
2016-05-14t9107: switch inverted single/double quotes in testJeff King1-2/+3
2016-05-14t9107: use "return 1" instead of "exit 1"Jeff King1-16/+26
2016-05-13diff: run arguments through precompose_argvAlexander Rinass5-0/+47
2016-05-13t9100,t3419: enclose all test code in single-quotesJeff King2-20/+20
2016-05-13t/lib-git-svn: drop $remote_git_svn and $git_svn_idJeff King11-63/+60
2016-05-13Twelfth batch for 2.9Junio C Hamano1-0/+20
2016-05-13Merge branch 'sb/submodule-module-list-pathspec-fix'Junio C Hamano1-1/+1
2016-05-13Merge branch 'jc/commit-tree-ignore-commit-gpgsign'Junio C Hamano4-10/+16
2016-05-13git-multimail: update to release 1.3.1Matthieu Moy4-4/+20
2016-05-13Documentation: clarify signature verificationKeller Fuchs2-4/+7
2016-05-13perf: run "rebase -i" under perfJohannes Schindelin1-0/+36
2016-05-13perf: make the tests work in worktreesJohannes Schindelin1-7/+7
2016-05-13perf: let's disable symlinks when they are not availableJohannes Schindelin1-1/+4
2016-05-12i18n: unpack-trees: avoid substituting only a verb in sentencesVasco Almeida2-22/+56
2016-05-11rerere: plug memory leaks upon "rerere forget" failureJunio C Hamano1-8/+17
2016-05-11Documentation/git-mailinfo: fix typoVasco Almeida1-1/+1
2016-05-11test-lib: set BASH_XTRACEFD automaticallyJeff King2-3/+16
2016-05-11Windows: only add a no-op pthread_sigmask() when neededJohannes Schindelin1-0/+2
2016-05-11mingw: remove unnecessary definitionJohannes Schindelin1-3/+0
2016-05-11mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin7-0/+147
2016-05-10rebase--interactive: avoid empty list in shell for-loopJeff King1-0/+1
2016-05-10Eleventh batch for 2.9Junio C Hamano1-0/+21
2016-05-10Merge branch 'svn/bad-ref' of git://bogomips.org/git-svnJunio C Hamano1-1/+2
2016-05-10Merge branch 'sk/gitweb-highlight-encoding'Junio C Hamano1-0/+3
2016-05-10Merge branch 'sb/clean-test-fix'Junio C Hamano1-1/+1
2016-05-10Merge branch 'rn/glossary-typofix'Junio C Hamano1-1/+1
2016-05-10Merge branch 'ls/travis-submitting-patches'Junio C Hamano1-17/+63
2016-05-10Merge branch 'js/close-packs-before-gc'Junio C Hamano1-0/+1
2016-05-10Merge branch 'ew/normal-to-e'Junio C Hamano1-0/+1
2016-05-10Merge branch 'ls/p4-lfs'Junio C Hamano3-10/+24
2016-05-10Merge branch 'sb/misc-cleanups'Junio C Hamano2-10/+7
2016-05-10Merge branch 'ew/doc-split-pack-disables-bitmap'Junio C Hamano4-9/+23
2016-05-10wrap-for-bin.sh: regenerate bin-wrappers when switching branchesDuy Nguyen1-0/+1
2016-05-10t0040: convert a few tests to use test-parse-options --expectJunio C Hamano1-18/+2
2016-05-10t0040: remove unused test helpersJunio C Hamano1-24/+0
2016-05-10test-parse-options: --expect=<string> option to simplify testsJunio C Hamano2-15/+76
2016-05-10test-parse-options: fix output when callback option failsJunio C Hamano2-5/+17
2016-05-10submodule: ensure that -c http.extraheader is heededJohannes Schindelin1-1/+10
2016-05-10t3404: fix typoJohannes Schindelin1-1/+1
2016-05-10travis-ci: build documentationLars Schneider2-0/+29
2016-05-10ci: validate "linkgit:" in documentationJunio C Hamano3-0/+76
2016-05-10Merge branch 'jk/submodule-c-credential' into js/http-custom-headersJunio C Hamano9-27/+140
2016-05-10t5551: make the test for extra HTTP headers more robustJohannes Schindelin1-1/+2
2016-05-10tests: adjust the configuration for Apache 2.2Johannes Schindelin1-4/+12
2016-05-10commit: add a commit.verbose config variablePranit Bauva4-1/+67
2016-05-10fsck: detect and warn a commit with embedded NULJunio C Hamano2-0/+26
2016-05-09Documentation: fix linkgit referencesJunio C Hamano8-10/+10
2016-05-09t6036: remove pointless test that expects failureJunio C Hamano1-83/+0
2016-05-09ll-merge: use a longer conflict marker for internal mergeJunio C Hamano3-4/+9
2016-05-09test-lib-functions.sh: rewrite test_seq without PerlJunio C Hamano1-1/+6
2016-05-09t4151: make sure argument to 'test -z' is givenArmin Kunaschik1-1/+1
2016-05-09test-lib-functions.sh: remove misleading comment on test_seqJunio C Hamano1-14/+7
2016-05-09wrapper.c: use warning_errno()Nguyễn Thái Ngọc Duy1-2/+2
2016-05-09vcs-svn: use error_errno()Nguyễn Thái Ngọc Duy4-7/+7
2016-05-09upload-pack.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09unpack-trees.c: use error_errno()Nguyễn Thái Ngọc Duy1-4/+2
2016-05-09transport-helper.c: use error_errno()Nguyễn Thái Ngọc Duy1-3/+3
2016-05-09sha1_file.c: use {error,die,warning}_errno()Nguyễn Thái Ngọc Duy1-19/+13
2016-05-09server-info.c: use error_errno()Nguyễn Thái Ngọc Duy1-1/+1
2016-05-09sequencer.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09run-command.c: use error_errno()Nguyễn Thái Ngọc Duy1-8/+7
2016-05-09rerere.c: use error_errno() and warning_errno()Nguyễn Thái Ngọc Duy1-11/+7
2016-05-09reachable.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09mailmap.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09ident.c: use warning_errno()Nguyễn Thái Ngọc Duy1-5/+3
2016-05-09http.c: use error_errno() and warning_errno()Nguyễn Thái Ngọc Duy1-6/+4
2016-05-09grep.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+2
2016-05-09gpg-interface.c: use error_errno()Nguyễn Thái Ngọc Duy1-4/+2
2016-05-09fast-import.c: use error_errno()Nguyễn Thái Ngọc Duy1-5/+5
2016-05-09entry.c: use error_errno()Nguyễn Thái Ngọc Duy1-6/+4
2016-05-09editor.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09diff-no-index.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09credential-cache--daemon.c: use warning_errno()Nguyễn Thái Ngọc Duy1-2/+2
2016-05-09copy.c: use error_errno()Nguyễn Thái Ngọc Duy1-3/+3
2016-05-09connected.c: use error_errno()Nguyễn Thái Ngọc Duy1-6/+3
2016-05-09config.c: use error_errno()Nguyễn Thái Ngọc Duy1-13/+9
2016-05-09compat/win32/syslog.c: use warning_errno()Nguyễn Thái Ngọc Duy1-3/+3
2016-05-09combine-diff.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09check-racy.c: use error_errno()Nguyễn Thái Ngọc Duy1-1/+1
2016-05-09builtin/worktree.c: use error_errno()Nguyễn Thái Ngọc Duy1-1/+1
2016-05-09builtin/upload-archive.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09builtin/update-index.c: prefer "err" to "errno" in process_lstat_errorNguyễn Thái Ngọc Duy1-1/+1
2016-05-09builtin/rm.c: use warning_errno()Nguyễn Thái Ngọc Duy1-1/+1
2016-05-09builtin/pack-objects.c: use die_errno() and warning_errno()Nguyễn Thái Ngọc Duy1-4/+2
2016-05-09builtin/merge-file.c: use error_errno()Nguyễn Thái Ngọc Duy1-5/+5
2016-05-09builtin/mailsplit.c: use error_errno()Nguyễn Thái Ngọc Duy1-5/+5
2016-05-09builtin/help.c: use warning_errno()Nguyễn Thái Ngọc Duy1-4/+4
2016-05-09builtin/fetch.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+2
2016-05-09builtin/branch.c: use error_errno()Nguyễn Thái Ngọc Duy1-2/+1
2016-05-09builtin/am.c: use error_errno()Nguyễn Thái Ngọc Duy1-6/+5
2016-05-09bisect.c: use die_errno() and warning_errno()Nguyễn Thái Ngọc Duy1-4/+3
2016-05-09usage.c: add warning_errno() and error_errno()Nguyễn Thái Ngọc Duy2-0/+23
2016-05-09usage.c: move format processing out of die_errno()Nguyễn Thái Ngọc Duy1-11/+16
2016-05-09i18n: remote: add comment for translatorsVasco Almeida1-0/+2
2016-05-09t6302: simplify non-gpg casesJeff King1-23/+22
2016-05-09t6041: do not compress backup tar fileStefan Beller1-2/+2
2016-05-09t3513: do not compress backup tar fileStefan Beller1-2/+2
2016-05-09t5601: Remove trailing space in sed expressionTorsten Bögershausen1-1/+1
2016-05-08Git/SVN: die when there is no commit metadataChristian Couder1-1/+2
2016-05-06Sync with maintJunio C Hamano1-0/+9
2016-05-06Almost ready for 2.8.3Junio C Hamano1-0/+9
2016-05-06Merge branch 'sb/submodule-path-misc-bugs' into maintJunio C Hamano3-11/+133
2016-05-06Merge branch 'ky/imap-send-openssl-1.1.0' into maintJunio C Hamano5-28/+21
2016-05-06Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano1-0/+1
2016-05-06Merge branch 'cc/apply' into maintJunio C Hamano1-15/+15
2016-05-06Merge branch 'kn/for-each-tag-branch' into maintJunio C Hamano1-1/+1
2016-05-06Tenth batch for 2.9Junio C Hamano1-2/+30
2016-05-06Merge branch 'jk/diff-compact-heuristic'Junio C Hamano3-4/+49
2016-05-06Merge branch 'ls/p4-lfs-test-fix-2.7.0'Junio C Hamano1-1/+1
2016-05-06Merge branch 'bc/object-id'Junio C Hamano21-98/+109
2016-05-06Merge branch 'bw/rebase-merge-entire-branch'Junio C Hamano3-3/+14
2016-05-06Merge branch 'jc/drop-git-spec-in'Junio C Hamano2-343/+6
2016-05-06Merge branch 'js/http-custom-headers'Junio C Hamano7-10/+61
2016-05-06Merge branch 'sb/clone-shallow-passthru'Junio C Hamano3-3/+100
2016-05-06Merge branch 'ld/p4-test-py3'Junio C Hamano2-6/+7
2016-05-06Merge branch 'sb/config-exit-status-list'Junio C Hamano1-3/+3
2016-05-06typofix: assorted typofixes in comments, documentation and messagesLi Peng12-14/+14
2016-05-06submodule: stop sanitizing config optionsJeff King5-93/+4
2016-05-06remote.c: specify correct plural form in "commit diverge" messageNguyễn Thái Ngọc Duy1-1/+1
2016-05-05config: consistently format $variables in monospaced fontBrian Norris1-11/+11
2016-05-05submodule deinit: require '--all' instead of '.' for all submodulesStefan Beller3-10/+48
2016-05-05t7507-commit-verbose: improve test coverage by testing number of diffsPranit Bauva1-7/+9
2016-05-05parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva4-17/+24
2016-05-05t/t7507: improve test coveragePranit Bauva1-0/+5
2016-05-05t0040-parse-options: improve test coveragePranit Bauva1-0/+114