Merge branch 'tg/stash-doc-cleanup'
[gitweb.git] / builtin / difftool.c
2017-02-15 Merge branch 'tg/stash-doc-cleanup'
2017-02-15 Merge branch 'jk/doc-submodule-markup-fix'
2017-02-15 Merge branch 'jk/doc-remote-helpers-markup-fix'
2017-02-15 Merge branch 'sb/doc-unify-bottom'
2017-02-15 Merge branch 'sb/push-options-via-transport'
2017-02-15 Merge branch 'cw/completion'
2017-02-15 Merge branch 'rs/swap'
2017-02-15 Merge branch 'sb/submodule-doc'
2017-02-10 Merge branch 'nd/rev-list-all-includes-HEAD-doc'
2017-02-10 Merge branch 'rs/fill-directory-optim'
2017-02-10 Merge branch 'jk/log-graph-name-only'
2017-02-10 Merge branch 'dl/difftool-doc-no-gui-option'
2017-02-10 Merge branch 'js/difftool-builtin'
2017-02-10 Merge branch 'rs/p5302-create-repositories-before-tests'
2017-02-10 Merge branch 'ps/worktree-prune-help-fix'
2017-02-10 Merge branch 'ew/complete-svn-authorship-options'
2017-02-10 Merge branch 'bw/push-submodule-only'
2017-02-08 Merge branch 'da/difftool-dir-diff-fix' into da/t7800...
2017-02-06 difftool: fix bug when printing usage
2017-02-03 Merge branch 'cw/log-updates-for-all-refs-really'
2017-02-03 Merge branch 'pl/complete-diff-submodule-diff'
2017-02-03 Merge branch 'rs/object-id'
2017-02-03 Merge branch 'js/re-running-failed-tests'
2017-02-03 Merge branch 'sb/submodule-update-initial-runs-custom...
2017-02-03 Merge branch 'sb/submodule-recursive-absorb'
2017-02-03 Merge branch 'sb/unpack-trees-super-prefix'
2017-02-02 Sync with v2.11.1
2017-02-02 Merge branch 'nd/log-graph-configurable-colors'
2017-02-02 Merge branch 'ep/commit-static-buf-cleanup'
2017-02-02 Merge branch 'bc/use-asciidoctor-opt'
2017-02-02 Merge branch 'sg/mailmap-self'
2017-02-02 Merge branch 'js/mingw-hooks-with-exe-suffix'
2017-02-02 Merge branch 'rs/receive-pack-cleanup'
2017-02-02 Merge branch 'mm/reset-facl-before-umask-test'
2017-02-02 Merge branch 'hv/mingw-help-is-executable'
2017-02-02 Merge branch 'gv/mingw-p4-mapuser'
2017-02-02 Merge branch 'rs/absolute-pathdup'
2017-02-02 Merge branch 'js/unzip-in-usr-bin-workaround'
2017-02-02 Merge branch 'cw/doc-sign-off'
2017-02-02 Merge branch 'js/status-pre-rebase-i'
2017-02-02 Merge branch 'js/retire-relink'
2017-02-02 Merge branch 'sb/submodule-add-force'
2017-01-31 Sync with maint
2017-01-31 Merge branch 'jk/fsck-connectivity-check-fix'
2017-01-31 Merge branch 'js/difftool-builtin'
2017-01-25 difftool: hack around -Wzero-length-format warning
2017-01-19 difftool: retire the scripted version
2017-01-19 difftool: implement the functionality in the builtin
2017-01-17 difftool: add a skeleton for the upcoming builtin