summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2018-03-15Git 2.17-rc0v2.17.0-rc0Junio C Hamano2-1/+11
2018-03-15Merge branch 'tl/userdiff-csharp-async'Junio C Hamano1-1/+1
2018-03-15Merge branch 'sg/cvs-tests-with-x'Junio C Hamano2-9/+7
2018-03-15Merge branch 'ab/man-sec-list'Junio C Hamano1-0/+3
2018-03-15Merge branch 'ab/perl-fixes'Junio C Hamano15-158/+431
2018-03-15Merge branch 'cl/send-email-reply-to'Junio C Hamano4-20/+43
2018-03-15Merge branch 'np/send-email-header-parsing'Junio C Hamano1-38/+77
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano25-238/+231
2018-03-14Merge branch 'nd/object-allocation-comments'Junio C Hamano5-12/+20
2018-03-14Merge branch 'jk/smart-http-protocol-doc-fix'Junio C Hamano1-0/+3
2018-03-14Merge branch 'jk/add-i-diff-filter'Junio C Hamano2-0/+28
2018-03-14Merge branch 'nd/worktree-move'Junio C Hamano8-17/+452
2018-03-14Merge branch 'pw/add-p-recount'Junio C Hamano2-152/+251
2018-03-14Merge branch 'ab/pre-auto-gc-battery'Junio C Hamano1-1/+1
2018-03-14Merge branch 'sg/test-x'Junio C Hamano12-62/+94
2018-03-14Merge branch 'rj/test-i18ngrep'Junio C Hamano2-21/+6
2018-03-14Merge branch 'ma/roll-back-lockfiles'Junio C Hamano3-22/+27
2018-03-14Merge branch 'nd/diff-stat-with-summary'Junio C Hamano8-33/+109
2018-03-08t9402-git-cvsserver-refs: don't check the stderr of a subshellSZEDER Gábor1-4/+4
2018-03-08t9400-git-cvsserver-server: don't rely on the output of 'test_cmp'SZEDER Gábor1-5/+3
2018-03-08Eighth batch for 2.17Junio C Hamano1-5/+40
2018-03-08Merge branch 'ag/userdiff-go-funcname'Junio C Hamano8-0/+37
2018-03-08Merge branch 'ab/gc-auto-in-commit'Junio C Hamano1-0/+2
2018-03-08Merge branch 'bp/untracked-cache-noflush'Junio C Hamano2-2/+16
2018-03-08Merge branch 'rs/perf-repeat-thrice-by-default'Junio C Hamano1-5/+3
2018-03-08Merge branch 'mk/doc-pretty-fill'Junio C Hamano1-1/+1
2018-03-08Merge branch 'jc/test-must-be-empty'Junio C Hamano1-1/+5
2018-03-08Merge branch 'ds/mark-parents-uninteresting-optim'Junio C Hamano1-1/+2
2018-03-08Merge branch 'ds/find-unique-abbrev-optim'Junio C Hamano1-7/+7
2018-03-08Merge branch 'sg/subtree-signed-commits'Junio C Hamano1-6/+6
2018-03-08Merge branch 'rv/grep-cleanup'Junio C Hamano1-13/+20
2018-03-08Merge branch 'ot/ref-filter-cleanup'Junio C Hamano1-27/+24
2018-03-08Merge branch 'jh/status-no-ahead-behind'Junio C Hamano10-35/+196
2018-03-08Merge branch 'sg/travis-build-during-script-phase'Junio C Hamano3-15/+3
2018-03-08git manpage: note git-security@googlegroups.comÆvar Arnfjörð Bjarmason1-0/+3
2018-03-08userdiff.c: add C# async keyword in diff patternThomas Levesque1-1/+1
2018-03-07completion: more subcommands in _git_notes()Nguyễn Thái Ngọc Duy1-2/+2
2018-03-07completion: complete --{reuse,reedit}-message= for all notes subcmdsNguyễn Thái Ngọc Duy1-2/+1
2018-03-07completion: simplify _git_notesNguyễn Thái Ngọc Duy1-11/+3
2018-03-07completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdateNguyễn Thái Ngọc Duy3-6/+5
2018-03-06Seventh batch for 2.17Junio C Hamano1-0/+50
2018-03-06Merge branch 'bw/perl-timegm-timelocal-fix'Junio C Hamano4-4/+8
2018-03-06Merge branch 'jk/strbuf-read-file-close-error'Junio C Hamano1-1/+5
2018-03-06Merge branch 'bw/c-plus-plus'Junio C Hamano63-662/+663
2018-03-06Merge branch 'rs/strbuf-read-file-or-whine'Junio C Hamano1-46/+28
2018-03-06Merge branch 'ms/non-ascii-ticks'Junio C Hamano1-7/+7
2018-03-06Merge branch 'jk/test-helper-v-output-fix'Junio C Hamano1-10/+10
2018-03-06Merge branch 'jk/cached-commit-buffer'Junio C Hamano5-46/+1
2018-03-06Merge branch 'bw/doc-submodule-recurse-config-with-clone'Junio C Hamano1-1/+2
2018-03-06Merge branch 'jc/allow-ff-merging-kept-tags'Junio C Hamano4-7/+79
2018-03-06Merge branch 'ab/simplify-perl-makefile'Junio C Hamano1-5/+7
2018-03-06Merge branch 'pw/add-p-single'Junio C Hamano1-26/+48
2018-03-06Merge branch 'sg/t6300-modernize'Junio C Hamano1-5/+2
2018-03-06Merge branch 'sb/color-h-cleanup'Junio C Hamano3-12/+34
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano12-11/+130
2018-03-06Merge branch 'xz/send-email-batch-size'Junio C Hamano1-0/+4
2018-03-06Merge branch 'ab/fetch-prune'Junio C Hamano9-60/+392
2018-03-06Merge branch 'sm/mv-dry-run-update'Junio C Hamano2-2/+7
2018-03-06Merge branch 'nm/tag-edit'Junio C Hamano3-3/+46
2018-03-06t2028: fix minor error and issues in newly-added "worktree move" testsEric Sunshine1-10/+9
2018-03-06object.h: realign object flag allocation commentNguyễn Thái Ngọc Duy1-16/+16
2018-03-06object.h: update flag allocation commentNguyễn Thái Ngọc Duy5-1/+9
2018-03-06send-email: support separate Reply-To addressChristian Ludwig4-2/+25
2018-03-06send-email: rename variable for clarityChristian Ludwig1-19/+19
2018-03-05add--interactive: detect bogus diffFilter outputJeff King2-0/+16
2018-03-05t3701: add a test for interactive.diffFilterJeff King1-0/+12
2018-03-05smart-http: document flush after "# service" lineJeff King1-0/+3
2018-03-05perl Git::LoadCPAN: emit better errors under NO_PERL_CPAN_FALLBACKSÆvar Arnfjörð Bjarmason3-5/+44
2018-03-05Makefile: add NO_PERL_CPAN_FALLBACKS knobTodd Zullinger1-0/+8
2018-03-05perl: move the perl/Git/FromCPAN tree to perl/FromCPANÆvar Arnfjörð Bjarmason5-3/+5
2018-03-05perl: generalize the Git::LoadCPAN facilityÆvar Arnfjörð Bjarmason3-58/+82
2018-03-05perl: move CPAN loader wrappers to another namespaceÆvar Arnfjörð Bjarmason5-10/+10
2018-03-05perl: update our copy of Mail::AddressÆvar Arnfjörð Bjarmason1-2/+6
2018-03-05perl: update our ancient copy of Error.pmÆvar Arnfjörð Bjarmason2-41/+255
2018-03-05git-send-email: unconditionally use Net::{SMTP,Domain}Ævar Arnfjörð Bjarmason1-13/+11
2018-03-05Git.pm: hard-depend on the File::{Temp,Spec} modulesÆvar Arnfjörð Bjarmason1-8/+2
2018-03-05gitweb: hard-depend on the Digest::MD5 5.8 moduleÆvar Arnfjörð Bjarmason2-15/+5
2018-03-05add -p: don't rely on apply's '--recount' optionPhillip Wood1-1/+1
2018-03-05add -p: fix counting when splitting and coalescingPhillip Wood2-8/+34
2018-03-05add -p: calculate offset delta for edited patchesPhillip Wood2-10/+51
2018-03-01userdiff: add built-in pattern for golangAlban Gruin8-0/+37
2018-03-01add -p: adjust offsets of subsequent hunks when one is skippedPhillip Wood2-3/+14
2018-03-01t3701: add failing test for pathological context linesPhillip Wood1-0/+30
2018-03-01t3701: don't hard code sha1 hash valuesPhillip Wood1-10/+23
2018-03-01commit: run git gc --auto just before the post-commit hookÆvar Arnfjörð Bjarmason1-0/+2
2018-02-28hooks/pre-auto-gc-battery: allow gc to run on non-laptopsAdam Borowski1-1/+1
2018-02-28Sixth batch for 2.17Junio C Hamano1-5/+25
2018-02-28Merge branch 'jk/push-options-via-transport-fix'Junio C Hamano2-12/+39
2018-02-28Merge branch 'tz/do-not-clean-spec-file'Junio C Hamano1-1/+1
2018-02-28Merge branch 'tg/worktree-create-tracking'Junio C Hamano1-2/+3
2018-02-28Merge branch 'gs/test-unset-xdg-cache-home'Junio C Hamano1-0/+1
2018-02-28Merge branch 'tk/apply-dev-null-verify-name-fix'Junio C Hamano2-1/+18
2018-02-28Merge branch 'sb/status-doc-fix'Junio C Hamano1-2/+2
2018-02-28Merge branch 'es/worktree-add-post-checkout-hook'Junio C Hamano2-12/+62
2018-02-28Merge branch 'nd/am-quit'Junio C Hamano4-4/+28
2018-02-28untracked cache: use git_env_bool() not getenv() for customizationJunio C Hamano2-4/+14
2018-02-28travis-ci: run tests with '-x' tracingSZEDER Gábor1-1/+1
2018-02-28t/README: add a note about don't saving stderr of compound commandsSZEDER Gábor1-3/+17
2018-02-28t1510-repo-setup: mark as untraceable with '-x'SZEDER Gábor1-0/+4
2018-02-28t9903-bash-prompt: don't check the stderr of __git_ps1()SZEDER Gábor1-12/+2
2018-02-28t5570-git-daemon: don't check the stderr of a subshellSZEDER Gábor1-1/+1
2018-02-28t5526: use $TRASH_DIRECTORY to specify the path of GIT_TRACE log fileSZEDER Gábor1-1/+1
2018-02-28t5500-fetch-pack: don't check the stderr of a subshellSZEDER Gábor1-6/+6
2018-02-28t3030-merge-recursive: don't check the stderr of a subshellSZEDER Gábor1-16/+20
2018-02-28sequencer: do not roll back lockfile unnecessarilyMartin Ågren1-12/+6
2018-02-28merge: always roll back lock in `checkout_fast_forward()`Martin Ågren1-3/+9
2018-02-28merge-recursive: always roll back lock in `merge_recursive_generic()`Martin Ågren1-1/+4
2018-02-28t5536: simplify checking of messages output to stderrSZEDER Gábor1-18/+4
2018-02-27diff: add --compact-summaryNguyễn Thái Ngọc Duy8-0/+83
2018-02-27revision.c: reduce object database queriesDerrick Stolee1-1/+2
2018-02-27perf: use GIT_PERF_REPEAT_COUNT=3 by default even without config fileRené Scharfe1-5/+3
2018-02-27Git.pm: add the "use warnings" pragmaÆvar Arnfjörð Bjarmason1-0/+1
2018-02-27Git.pm: remove redundant "use strict" from sub-packageÆvar Arnfjörð Bjarmason1-1/+0
2018-02-27perl: *.pm files should not have the executable bitÆvar Arnfjörð Bjarmason1-0/+0
2018-02-27sequencer: always roll back lock in `do_recursive_merge()`Martin Ågren1-1/+3
2018-02-27sequencer: make lockfiles non-staticMartin Ågren1-5/+5
2018-02-27sha1_name: fix uninitialized memory errorsDerrick Stolee1-7/+7
2018-02-27docs/pretty-formats: fix typo '% <(<N>)' -> '%<|(<N>)'Mårten Kongstad1-1/+1
2018-02-27test_must_be_empty: make sure the file exists, not just emptyJunio C Hamano1-1/+5
2018-02-27t1507-rev-parse-upstream: don't check the stderr of a shell functionSZEDER Gábor1-7/+7
2018-02-27t: add means to disable '-x' tracing for individual test scriptsSZEDER Gábor2-1/+21
2018-02-27t: prevent '-x' tracing from interfering with test helpers' stderrSZEDER Gábor2-14/+14
2018-02-27Fifth batch for 2.17Junio C Hamano1-10/+48
2018-02-27Sync with maintJunio C Hamano0-0/+0
2018-02-27Merge branch 'ys/bisect-object-id-missing-conversion-fix' into maintJunio C Hamano1-3/+3
2018-02-27Merge branch 'sb/submodule-update-reset-fix' into maintJunio C Hamano3-3/+23
2018-02-27Merge branch 'ab/commit-m-with-fixup' into maintJunio C Hamano3-4/+15
2018-02-27Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano6-44/+143
2018-02-27Merge branch 'jt/binsearch-with-fanout'Junio C Hamano3-25/+54
2018-02-27Merge branch 'rd/typofix'Junio C Hamano5-6/+6
2018-02-27Merge branch 'jk/test-hashmap-updates'Junio C Hamano1-26/+27
2018-02-27Merge branch 'jk/sq-dequote-on-bogus-input'Junio C Hamano2-3/+32
2018-02-27Merge branch 'bp/fsmonitor'Junio C Hamano1-2/+2
2018-02-27Merge branch 'bc/doc-interpret-trailers-grammofix'Junio C Hamano1-1/+1
2018-02-27Merge branch 'as/ll-i18n'Junio C Hamano5-54/+54
2018-02-27Merge branch 'sg/doc-test-must-fail-args'Junio C Hamano2-2/+22
2018-02-27Merge branch 'sb/describe-blob'Junio C Hamano2-1/+9
2018-02-27Merge branch 'rs/check-ignore-multi'Junio C Hamano2-1/+22
2018-02-27Merge branch 'rj/sparse-updates'Junio C Hamano2-1/+2
2018-02-27Merge branch 'jk/t0002-simplify'Junio C Hamano1-43/+10
2018-02-27Merge branch 'js/packet-read-line-check-null'Junio C Hamano4-3/+7
2018-02-27Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'Junio C Hamano2-2/+26
2018-02-27Merge branch 'jk/gettext-poison'Junio C Hamano2-8/+4
2018-02-27Merge branch 'jk/doc-do-not-write-extern'Junio C Hamano1-0/+5
2018-02-27Merge branch 'bp/name-hash-dirname-fix'Junio C Hamano2-4/+18
2018-02-27Merge branch 'jc/blame-missing-path'Junio C Hamano1-6/+14
2018-02-27Merge branch 'ab/untracked-cache-invalidation-docs'Junio C Hamano1-0/+26
2018-02-27Merge branch 'nd/fix-untracked-cache-invalidation'Junio C Hamano7-18/+157
2018-02-23perl: call timegm and timelocal with 4-digit yearBernhard M. Wiedemann4-4/+8
2018-02-23subtree: fix add and pull for GPG-signed commitsStephen R Guglielmo1-6/+6
2018-02-23strbuf_read_file(): preserve errno across close() callJeff King1-1/+5
2018-02-23grep: simplify grep_oid and grep_fileRasmus Villemoes1-4/+2
2018-02-23grep: move grep_source_init outside critical sectionRasmus Villemoes1-9/+18
2018-02-22Documentation/gitsubmodules.txt: avoid non-ASCII apostrophesMotoki Seki1-7/+7
2018-02-22sequencer: factor out strbuf_read_file_or_whine()René Scharfe1-46/+28
2018-02-22t: send verbose test-helper output to fd 4Jeff King1-10/+10
2018-02-22revision: drop --show-all optionJeff King3-42/+0
2018-02-22commit: drop uses of get_cached_commit_buffer()Jeff King2-4/+1
2018-02-22replace: rename 'new' variablesBrandon Williams1-17/+17
2018-02-22trailer: rename 'template' variablesBrandon Williams1-5/+5
2018-02-22tempfile: rename 'template' variablesBrandon Williams2-23/+23
2018-02-22wrapper: rename 'template' variablesBrandon Williams2-22/+22
2018-02-22environment: rename 'namespace' variablesBrandon Williams1-5/+5
2018-02-22diff: rename 'template' variablesBrandon Williams1-5/+5
2018-02-22environment: rename 'template' variablesBrandon Williams2-8/+8
2018-02-22init-db: rename 'template' variablesBrandon Williams1-15/+15
2018-02-22unpack-trees: rename 'new' variablesBrandon Williams1-3/+3
2018-02-22trailer: rename 'new' variablesBrandon Williams1-17/+17
2018-02-22submodule: rename 'new' variablesBrandon Williams2-16/+16
2018-02-22split-index: rename 'new' variablesBrandon Williams2-9/+9
2018-02-22remote: rename 'new' variablesBrandon Williams1-10/+10
2018-02-22ref-filter: rename 'new' variablesBrandon Williams1-8/+8
2018-02-22read-cache: rename 'new' variablesBrandon Williams1-20/+20
2018-02-22line-log: rename 'new' variablesBrandon Williams1-28/+28
2018-02-22imap-send: rename 'new' variablesBrandon Williams1-7/+7
2018-02-22http: rename 'new' variablesBrandon Williams1-5/+5
2018-02-22entry: rename 'new' variablesBrandon Williams1-20/+20
2018-02-22diffcore-delta: rename 'new' variablesBrandon Williams1-8/+8
2018-02-22diff: rename 'new' variablesBrandon Williams1-22/+22
2018-02-22diff-lib: rename 'new' variableBrandon Williams1-19/+19
2018-02-22commit: rename 'new' variablesBrandon Williams1-9/+9
2018-02-22combine-diff: rename 'new' variablesBrandon Williams1-6/+6
2018-02-22remote: rename 'new' variablesBrandon Williams1-33/+33
2018-02-22reflog: rename 'new' variablesBrandon Williams1-4/+4
2018-02-22pack-redundant: rename 'new' variablesBrandon Williams1-27/+27
2018-02-22help: rename 'new' variablesBrandon Williams1-5/+5
2018-02-22checkout: rename 'new' variablesBrandon Williams1-98/+98
2018-02-22apply: rename 'new' variablesBrandon Williams1-27/+27
2018-02-22apply: rename 'try' variablesBrandon Williams1-34/+34
2018-02-22diff: rename 'this' variablesBrandon Williams1-8/+8
2018-02-21Fourth batch for 2.17Junio C Hamano1-0/+12
2018-02-21Merge branch 'sg/test-i18ngrep'Junio C Hamano8-43/+72
2018-02-21Merge branch 'gs/rebase-allow-empty-message'Junio C Hamano7-11/+53
2018-02-21Merge branch 'lw/daemon-log-destination'Junio C Hamano2-10/+64
2018-02-21Merge branch 'nd/format-patch-stat-width'Junio C Hamano2-16/+37
2018-02-21submodule: indicate that 'submodule.recurse' doesn't apply to cloneBrandon Williams1-1/+2
2018-02-21ref-filter: get rid of gotoOlga Telezhnaya1-3/+3
2018-02-21ref-filter: get rid of duplicate codeOlga Telezhnaya1-24/+21
2018-02-20remote-curl: unquote incoming push-optionsJeff King2-1/+28
2018-02-20t5545: factor out http repository setupJeff King1-11/+11