summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveLibravatar Denton Liu2-0/+11
2019-05-13mergetool: fallback to tool when guitool unavailableLibravatar Denton Liu3-10/+48
2019-05-13mergetool--lib: create gui_mode functionLibravatar Denton Liu1-5/+8
2019-05-13mergetool: use get_merge_tool functionLibravatar Denton Liu4-11/+12
2019-04-25t7610: add mergetool --gui testsLibravatar Denton Liu1-0/+22
2019-04-25t7610: unsuppress outputLibravatar Denton Liu1-61/+61
2018-10-25doc: document diff/merge.guitool config keysLibravatar Denton Liu2-0/+14
2018-10-25completion: support `git mergetool --[no-]gui`Libravatar Denton Liu1-1/+1
2018-10-25mergetool: accept -g/--[no-]gui as argumentsLibravatar Denton Liu3-7/+31
2018-10-19Fifth batch for 2.20Libravatar Junio C Hamano1-0/+82
2018-10-19Merge branch 'jt/cache-tree-allow-missing-object-in-partial-clone'Libravatar Junio C Hamano2-1/+38
2018-10-19Merge branch 'tb/filter-alternate-refs'Libravatar Junio C Hamano6-13/+92
2018-10-19Merge branch 'jt/avoid-ls-refs'Libravatar Junio C Hamano7-13/+114
2018-10-19Merge branch 'ds/commit-graph-leakfix'Libravatar Junio C Hamano2-11/+16
2018-10-19Merge branch 'jt/non-blob-lazy-fetch'Libravatar Junio C Hamano3-42/+121
2018-10-19Merge branch 'pw/diff-color-moved-ws-fix'Libravatar Junio C Hamano1-41/+54
2018-10-19Merge branch 'rs/oidset-on-khash'Libravatar Junio C Hamano4-61/+81
2018-10-19Merge branch 'rs/grep-no-recursive'Libravatar Junio C Hamano3-2/+23
2018-10-19Merge branch 'nd/help-commands-verbose-by-default'Libravatar Junio C Hamano4-10/+54
2018-10-19Merge branch 'jc/how-to-document-api'Libravatar Junio C Hamano1-1/+4
2018-10-19Merge branch 'sm/show-superproject-while-conflicted'Libravatar Junio C Hamano2-1/+17
2018-10-19Merge branch 'jt/fetch-tips-in-partial-clone'Libravatar Junio C Hamano3-5/+33
2018-10-19Merge branch 'nd/status-refresh-progress'Libravatar Junio C Hamano6-11/+72
2018-10-19Merge branch 'bp/read-cache-parallel'Libravatar Junio C Hamano7-120/+739
2018-10-19Merge branch 'bp/rename-test-env-var'Libravatar Junio C Hamano8-18/+58
2018-10-19Merge branch 'ss/wt-status-committable'Libravatar Junio C Hamano4-119/+123
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano87-552/+751
2018-10-19Merge branch 'nd/complete-fetch-multiple-args'Libravatar Junio C Hamano1-0/+1
2018-10-16Fourth batch for 2.20Libravatar Junio C Hamano1-0/+50
2018-10-16Merge branch 'sf/complete-stash-list'Libravatar Junio C Hamano1-0/+3
2018-10-16Merge branch 'mw/doc-typofixes'Libravatar Junio C Hamano2-3/+2
2018-10-16Merge branch 'js/mingw-wants-vista-or-above'Libravatar Junio C Hamano4-9/+20
2018-10-16Merge branch 'rs/sequencer-oidset-insert-avoids-dups'Libravatar Junio C Hamano1-3/+1
2018-10-16Merge branch 'jk/oideq-hasheq-cleanup'Libravatar Junio C Hamano4-7/+8
2018-10-16Merge branch 'ma/mailing-list-address-in-git-help'Libravatar Junio C Hamano1-1/+3
2018-10-16Merge branch 'nd/packobjectshook-doc-fix'Libravatar Junio C Hamano1-4/+4
2018-10-16Merge branch 'rt/rebase-typofix'Libravatar Junio C Hamano1-3/+3
2018-10-16Merge branch 'ma/t1400-undebug-test'Libravatar Junio C Hamano1-1/+1
2018-10-16Merge branch 'ma/commit-graph-docs'Libravatar Junio C Hamano2-19/+20
2018-10-16Merge branch 'dz/credential-doc-url-matching-rules'Libravatar Junio C Hamano1-0/+6
2018-10-16Merge branch 'en/status-multiple-renames-to-the-same-target-fix'Libravatar Junio C Hamano2-0/+24
2018-10-16Merge branch 'ds/reachable-final-cleanup'Libravatar Junio C Hamano1-5/+3
2018-10-16Merge branch 'jk/check-everything-connected-is-long-gone'Libravatar Junio C Hamano1-1/+1
2018-10-16Merge branch 'jn/gc-auto'Libravatar Junio C Hamano3-10/+32
2018-10-16Merge branch 'jn/gc-auto-prep'Libravatar Junio C Hamano2-23/+19
2018-10-16Merge branch 'md/test-cleanup'Libravatar Junio C Hamano39-399/+568
2018-10-16Merge branch 'fe/doc-updates'Libravatar Junio C Hamano3-5/+39
2018-10-16Merge branch 'jn/mailmap-update'Libravatar Junio C Hamano1-1/+1
2018-10-16Merge branch 'tg/t5551-with-curl-7.61.1'Libravatar Junio C Hamano1-34/+34
2018-10-16Merge branch 'en/merge-cleanup'Libravatar Junio C Hamano1-93/+51