summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2021-05-21t4013: test "git diff-index -m"Libravatar Sergey Organov1-0/+13
2021-05-21t4013: test "git diff-tree -m"Libravatar Sergey Organov2-0/+12
2021-05-21t4013: test "git log -m --stat"Libravatar Sergey Organov2-0/+67
2021-05-21t4013: test "git log -m --raw"Libravatar Sergey Organov2-0/+62
2021-05-21t4013: test that "-m" alone has no effect in "git log"Libravatar Sergey Organov1-0/+8
2021-04-16doc/diff-options: document new --diff-merges featuresLibravatar Sergey Organov1-4/+11
2021-04-16diff-merges: introduce log.diffMerges config variableLibravatar Sergey Organov6-0/+46
2021-04-16diff-merges: adapt -m to enable default diff formatLibravatar Sergey Organov1-4/+4
2021-04-16diff-merges: refactor set_diff_merges()Libravatar Sergey Organov1-15/+21
2021-04-16diff-merges: introduce --diff-merges=onLibravatar Sergey Organov2-0/+15
2021-04-08Makefile: add missing dependencies of 'config-list.h'Libravatar SZEDER Gábor1-2/+2
2021-03-26Git 2.31.1Libravatar Junio C Hamano3-2/+29
2021-03-19Merge branch 'tb/git-mv-icase-fix'Libravatar Junio C Hamano1-1/+1
2021-03-19Merge branch 'rs/xcalloc-takes-nelem-first'Libravatar Junio C Hamano4-6/+17
2021-03-19Merge branch 'ah/make-fuzz-all-doc-update'Libravatar Junio C Hamano1-3/+3
2021-03-19Merge branch 'jk/slimmed-down'Libravatar Junio C Hamano5-102/+0
2021-03-19Merge branch 'rs/calloc-array'Libravatar Junio C Hamano89-189/+191
2021-03-19Merge branch 'rs/avoid-null-statement-after-macro-call'Libravatar Junio C Hamano2-2/+2
2021-03-19Merge branch 'km/config-doc-typofix'Libravatar Junio C Hamano1-1/+1
2021-03-19Merge branch 'jt/clone-unborn-head'Libravatar Junio C Hamano1-1/+1
2021-03-19Merge branch 'js/fsmonitor-unpack-fix'Libravatar Junio C Hamano2-2/+3
2021-03-19Merge branch 'jk/bisect-peel-tag-fix'Libravatar Junio C Hamano2-1/+20
2021-03-19Merge branch 'jh/fsmonitor-prework'Libravatar Junio C Hamano1-3/+3
2021-03-19Merge branch 'jc/calloc-fix'Libravatar Junio C Hamano2-6/+4
2021-03-17fsmonitor: do not forget to release the token in `discard_index()`Libravatar Johannes Schindelin1-0/+1
2021-03-17fsmonitor: fix memory corruption in some corner casesLibravatar Johannes Schindelin1-2/+2
2021-03-17config.txt: add missing periodLibravatar Kyle Meyer1-1/+1
2021-03-17bisect: peel annotated tags to commitsLibravatar Jeff King2-1/+20
2021-03-17t5606: run clone branch name test with protocol v2Libravatar Jonathan Tan1-1/+1
2021-03-17mem-pool: drop trailing semicolon from macro definitionLibravatar René Scharfe1-1/+1
2021-03-17block-sha1: drop trailing semicolon from macro definitionLibravatar René Scharfe1-1/+1
2021-03-17fsmonitor: avoid global-buffer-overflow READ when checking trivial responseLibravatar Andrzej Hunt1-3/+3
2021-03-15cocci: allow xcalloc(1, size)Libravatar Junio C Hamano1-1/+1
2021-03-15xcalloc: use CALLOC_ARRAY() when applicableLibravatar Junio C Hamano2-6/+4
2021-03-15Git 2.31Libravatar Junio C Hamano1-1/+1
2021-03-14Merge branch 'jn/mergetool-hideresolved-is-optional'Libravatar Junio C Hamano3-8/+7
2021-03-14Merge branch 'tb/pack-revindex-on-disk'Libravatar Junio C Hamano1-1/+2
2021-03-14Merge tag 'l10n-2.31.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano16-43702/+75702
2021-03-14vcs-svn: remove header files as wellLibravatar René Scharfe5-102/+0
2021-03-15l10n: zh_CN: for git v2.31.0 l10n round 1 and 2Libravatar Jiang Xin1-2985/+3337
2021-03-15Merge branch 'master' of github.com:vnwildman/gitLibravatar Jiang Xin1-3051/+3508
2021-03-14Merge branch 'l10n/zh_TW/210301' of github.com:l10n-tw/git-poLibravatar Jiang Xin1-3072/+3535
2021-03-14Merge branch 'po-id' of github.com:bagasme/git-poLibravatar Jiang Xin2-0/+24362
2021-03-14Merge branch 'master' of github.com:Softcatala/git-poLibravatar Jiang Xin1-13/+12
2021-03-14Merge branch 'russian-l10n' of github.com:DJm00n/git-po-ruLibravatar Jiang Xin1-5661/+7873
2021-03-14Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-poLibravatar Jiang Xin1-2902/+3226
2021-03-13use CALLOC_ARRAYLibravatar René Scharfe88-188/+190
2021-03-13git-compat-util.h: drop trailing semicolon from macro definitionLibravatar René Scharfe1-1/+1
2021-03-13doc: describe mergetool configuration in git-mergetool(1)Libravatar Jonathan Nieder1-0/+4
2021-03-13mergetool: do not enable hideResolved by defaultLibravatar Jonathan Nieder2-8/+3