difftool: handle unmerged files in dir-diff mode
[gitweb.git] / builtin / mktree.c
2016-02-24 Merge branch 'bc/http-empty-auth'
2016-02-24 Merge branch 'sp/remote-curl-ssl-strerror'
2016-02-24 Merge branch 'ew/force-ipv4'
2016-02-24 Merge branch 'nd/git-common-dir-fix'
2016-02-24 Merge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22 convert trivial cases to FLEX_ARRAY macros
2016-02-22 Sync with 2.7.2
2016-02-22 Merge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22 Merge branch 'jk/config-include'
2016-02-22 Merge branch 'ew/connect-verbose'
2016-02-22 Merge branch 'pw/completion-stash'
2016-02-17 Merge branch 'maint'
2016-02-17 Merge branch 'dw/mergetool-vim-window-shuffle'
2016-02-17 Merge branch 'ah/stripspace-optstring'
2016-02-17 Merge branch 'mm/clean-doc-fix'
2016-02-17 Merge branch 'jk/rerere-xsnprintf'
2016-02-17 Merge branch 'da/user-useconfigonly'
2016-02-17 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-02-17 Merge branch 'mg/mingw-test-fix'
2016-02-17 Merge branch 'js/mingw-tests'
2016-02-17 Merge branch 'jk/drop-rsync-transport'
2016-02-10 Merge branch 'js/test-lib-windows-emulated-yes'
2016-02-10 Merge branch 'wp/sha1-name-negative-match'
2016-02-10 Merge branch 'aw/push-force-with-lease-reporting'
2016-02-10 Merge branch 'ls/clean-smudge-override-in-config'
2016-02-10 Merge branch 'ew/connect-verbose'
2016-02-10 Merge branch 'cc/untracked'
2016-02-10 Merge branch 'js/xmerge-marker-eol'
2016-02-10 Merge branch 'nd/do-not-move-worktree-manually'
2016-02-05 Sync with 2.7.1
2016-02-03 Merge branch 'kf/http-proxy-auth-methods'
2016-02-03 Merge branch 'ls/travis-prove-order'
2016-02-03 Merge branch 'jk/ref-cache-non-repository-optim'
2016-02-03 Merge branch 'js/dirname-basename'
2016-02-03 Merge branch 'dt/unpack-compare-entry-optim'
2016-02-03 Merge branch 'pw/completion-stash'
2016-02-03 Merge branch 'pw/completion-show-branch'
2016-02-03 Merge branch 'jk/completion-rebase'
2016-02-03 Merge branch 'nd/diff-with-path-params'
2016-02-03 Merge branch 'lv/add-doc-working-tree'
2016-02-03 Merge branch 'dw/subtree-split-do-not-drop-merge'
2016-02-03 Merge branch 'tb/complete-word-diff-regex'
2016-02-03 Merge branch 'mk/asciidoctor-bq-workaround'
2016-02-03 Merge branch 'dg/subtree-test'
2016-02-03 Merge branch 'tg/ls-remote-symref'
2016-02-03 Merge branch 'tb/ls-files-eol'
2016-02-03 Merge branch 'jk/notes-merge-from-anywhere'
2016-02-01 Merge branch 'jk/list-tag-2.7-regression'
2016-02-01 Merge branch 'ew/svn-1.9.0-auth'
2016-01-29 Merge branch 'jk/shortlog'
2016-01-29 Merge branch 'jc/strbuf-getline'
2016-01-15 mktree: there are only two possible line terminations
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-09-01 Merge branch 'ah/submodule-typofix-in-error'
2015-09-01 Merge branch 'ah/reflog-typofix-in-error'
2015-09-01 Merge branch 'ah/read-tree-usage-string'
2015-09-01 Merge branch 'ah/pack-objects-usage-strings'
2015-09-01 Merge branch 'br/svn-doc-include-paths-config'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-08-19 Merge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-12 Merge branch 'sb/remove-unused-var-from-builtin-add'
2015-07-15 Merge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
2015-07-01 Merge branch 'jc/prompt-document-ps1-state-separator'
2015-06-24 Merge branch 'fk/doc-format-patch-vn'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-05 Merge branch 'jc/gitignore-precedence' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-19 Merge branch 'jc/gitignore-precedence'
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-21 Merge branch 'iu/fix-parse-options-h-comment' into...
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-04-14 Merge branch 'iu/fix-parse-options-h-comment'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-23 Merge branch 'jc/decorate-leaky-separator-color' into...
2015-03-20 Merge branch 'jc/decorate-leaky-separator-color'
2015-03-14 Merge branch 'jc/diff-test-updates' into maint
2015-03-14 Merge branch 'jc/apply-beyond-symlink' into maint
2015-03-10 Merge branch 'jc/decorate-leaky-separator-color' into...
next