summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-05-13mergetool: fallback to tool when guitool unavailableDenton Liu
2019-05-13mergetool--lib: create gui_mode functionDenton Liu
2019-05-13mergetool: use get_merge_tool functionDenton Liu
2019-04-25t7610: add mergetool --gui testsDenton Liu
2019-04-25t7610: unsuppress outputDenton Liu
2018-10-25doc: document diff/merge.guitool config keysDenton Liu
2018-10-25completion: support `git mergetool --[no-]gui`Denton Liu
2018-10-25mergetool: accept -g/--[no-]gui as argumentsDenton Liu
2018-10-19Fifth batch for 2.20Junio C Hamano
2018-10-19Merge branch 'jt/cache-tree-allow-missing-object-in-partial-clone'Junio C Hamano
2018-10-19Merge branch 'tb/filter-alternate-refs'Junio C Hamano
2018-10-19Merge branch 'jt/avoid-ls-refs'Junio C Hamano
2018-10-19Merge branch 'ds/commit-graph-leakfix'Junio C Hamano
2018-10-19Merge branch 'jt/non-blob-lazy-fetch'Junio C Hamano
2018-10-19Merge branch 'pw/diff-color-moved-ws-fix'Junio C Hamano
2018-10-19Merge branch 'rs/oidset-on-khash'Junio C Hamano
2018-10-19Merge branch 'rs/grep-no-recursive'Junio C Hamano
2018-10-19Merge branch 'nd/help-commands-verbose-by-default'Junio C Hamano
2018-10-19Merge branch 'jc/how-to-document-api'Junio C Hamano
2018-10-19Merge branch 'sm/show-superproject-while-conflicted'Junio C Hamano
2018-10-19Merge branch 'jt/fetch-tips-in-partial-clone'Junio C Hamano
2018-10-19Merge branch 'nd/status-refresh-progress'Junio C Hamano
2018-10-19Merge branch 'bp/read-cache-parallel'Junio C Hamano
2018-10-19Merge branch 'bp/rename-test-env-var'Junio C Hamano
2018-10-19Merge branch 'ss/wt-status-committable'Junio C Hamano
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-10-19Merge branch 'nd/complete-fetch-multiple-args'Junio C Hamano
2018-10-16Fourth batch for 2.20Junio C Hamano
2018-10-16Merge branch 'sf/complete-stash-list'Junio C Hamano
2018-10-16Merge branch 'mw/doc-typofixes'Junio C Hamano
2018-10-16Merge branch 'js/mingw-wants-vista-or-above'Junio C Hamano
2018-10-16Merge branch 'rs/sequencer-oidset-insert-avoids-dups'Junio C Hamano
2018-10-16Merge branch 'jk/oideq-hasheq-cleanup'Junio C Hamano
2018-10-16Merge branch 'ma/mailing-list-address-in-git-help'Junio C Hamano
2018-10-16Merge branch 'nd/packobjectshook-doc-fix'Junio C Hamano
2018-10-16Merge branch 'rt/rebase-typofix'Junio C Hamano
2018-10-16Merge branch 'ma/t1400-undebug-test'Junio C Hamano
2018-10-16Merge branch 'ma/commit-graph-docs'Junio C Hamano
2018-10-16Merge branch 'dz/credential-doc-url-matching-rules'Junio C Hamano
2018-10-16Merge branch 'en/status-multiple-renames-to-the-same-target-fix'Junio C Hamano
2018-10-16Merge branch 'ds/reachable-final-cleanup'Junio C Hamano
2018-10-16Merge branch 'jk/check-everything-connected-is-long-gone'Junio C Hamano
2018-10-16Merge branch 'jn/gc-auto'Junio C Hamano
2018-10-16Merge branch 'jn/gc-auto-prep'Junio C Hamano
2018-10-16Merge branch 'md/test-cleanup'Junio C Hamano
2018-10-16Merge branch 'fe/doc-updates'Junio C Hamano
2018-10-16Merge branch 'jn/mailmap-update'Junio C Hamano
2018-10-16Merge branch 'tg/t5551-with-curl-7.61.1'Junio C Hamano
2018-10-16Merge branch 'en/merge-cleanup'Junio C Hamano
2018-10-16Merge branch 'rj/header-check'Junio C Hamano