difftool: handle unmerged files in dir-diff mode
[gitweb.git] / Documentation / CodingGuidelines
2016-05-06 Merge branch 'ky/imap-send-openssl-1.1.0' into maint
2016-05-06 Merge branch 'js/replace-edit-use-editor-configuration...
2016-05-06 Merge branch 'kn/for-each-tag-branch' into maint
2016-05-02 Merge branch 'jc/xstrfmt-null-with-prec-0' into maint
2016-05-02 Merge branch 'ew/send-email-drop-data-dumper' into...
2016-05-02 Merge branch 'ad/cygwin-wants-rename' into maint
2016-05-02 Merge branch 'jc/http-socks5h' into maint
2016-05-02 Merge branch 'ad/commit-have-m-option' into maint
2016-05-02 Merge branch 'sb/submodule-helper-clone-regression...
2016-05-02 Merge branch 'jk/branch-shortening-funny-symrefs' into...
2016-05-02 Merge branch 'es/format-patch-doc-hide-no-patch' into...
2016-05-02 Merge branch 'ky/branch-d-worktree' into maint
2016-05-02 Merge branch 'ew/send-email-readable-message-id' into...
2016-04-29 Merge branch 'ep/trace-doc-sample-fix' into maint
2016-04-29 Merge branch 'jc/makefile-redirection-stderr' into...
2016-04-29 Merge branch 'ak/use-hashmap-iter-first-in-submodule...
2016-04-29 Merge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-29 Merge branch 'sk/send-pack-all-fix' into maint
2016-04-29 Merge branch 'sg/diff-multiple-identical-renames' into...
2016-04-15 Merge branch 'jv/merge-nothing-into-void' into maint
2016-04-15 Merge branch 'ss/commit-squash-msg' into maint
2016-04-15 Merge branch 'jk/send-email-rtrim-mailrc-alias' into...
2016-04-15 Merge branch 'da/mergetool-delete-delete-conflict'...
2016-04-15 Merge branch 'jk/getwholeline-getdelim-empty' into...
2016-04-15 Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-04-15 Merge branch 'jk/rev-parse-local-env-vars' into maint
2016-04-15 Merge branch 'jk/config-get-urlmatch' into maint
2016-04-15 Merge branch 'pb/t7502-drop-dup' into maint
2016-04-15 Merge branch 'jk/test-httpd-config-nosystem' into maint
2016-04-15 Merge branch 'sb/clone-t57-t56' into maint
2016-04-15 Merge branch 'jk/credential-cache-comment-exit' into...
2016-04-15 Merge branch 'ss/exc-flag-is-a-collection-of-bits'...
2016-04-15 Merge branch 'mp/upload-pack-use-embedded-args' into...
2016-04-15 Merge branch 'oa/doc-diff-check' into maint
2016-04-15 Merge branch 'pb/opt-cmdmode-doc' into maint
2016-04-15 Merge branch 'nd/apply-doc' into maint
2016-04-03 Merge branch 'mm/readme-markdown' into maint
2016-03-24 Merge branch 'ls/p4-doc-markup'
2016-03-24 Merge branch 'sb/submodule-module-list-pathspec-fix'
2016-03-21 Sync with maint
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-17 Sync with Git 2.7.4
2016-03-16 Sync with maint
2016-03-16 Merge branch 'jc/sane-grep'
2016-03-16 Merge branch 'cn/deprecate-ssh-git-url'
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-03-10 Sync with 2.7.3
2016-03-10 Merge branch 'jx/http-no-proxy'
2016-03-10 Merge branch 'jc/exclusion-doc'
2016-03-10 Merge branch 'js/close-packs-before-gc'
2016-03-10 Merge branch 'sb/rebase-summary'
2016-03-04 Merge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-03-04 Merge branch 'js/pthread-exit-emu-windows'
2016-03-04 Merge branch 'sb/submodule-parallel-fetch'
2016-03-04 Merge branch 'jk/tighten-alloc'
2016-03-04 Merge branch 'jk/pack-idx-corruption-safety'
2016-03-04 Merge branch 'mg/httpd-tests-update-for-apache-2.4'
2016-03-04 Merge branch 'js/mingw-tests'
2016-03-03 Merge branch 'jc/maint-index-pack-keep' into jc/index...
2016-02-26 Merge branch 'mm/readme-markdown'
2016-02-26 Merge branch 'ma/update-hooks-sample-typofix'
2016-02-26 Merge branch 'ls/makefile-cflags-developer-tweak'
2016-02-25 add DEVELOPER makefile knob to check for acknowledged...
2016-02-22 Merge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22 Merge branch 'jk/config-include'
2016-02-17 Merge branch 'jk/rerere-xsnprintf'
2016-02-05 Merge branch 'ss/clone-depth-single-doc' into maint
2016-02-05 Merge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05 Merge branch 'ew/for-each-ref-doc' into maint
2016-02-05 Merge branch 'ss/user-manual' into maint
2016-02-05 Merge branch 'jk/sanity' into maint
2016-02-05 Merge branch 'nd/exclusion-regression-fix' into maint
2016-02-05 Merge branch 'nd/dir-exclude-cleanup' into maint
2016-02-05 Merge branch 'nd/stop-setenv-work-tree' into maint
2016-01-29 Merge branch 'jk/sanity'
2016-01-20 Merge branch 'ss/clone-depth-single-doc'
2016-01-20 Merge branch 'nd/exclusion-regression-fix'
2016-01-20 Merge branch 'sg/t6050-failing-editor-test-fix'
2016-01-20 Merge branch 'ew/for-each-ref-doc'
2016-01-20 Merge branch 'ss/user-manual'
2016-01-20 Merge branch 'nd/dir-exclude-cleanup'
2016-01-20 Merge branch 'jk/pack-revindex'
2016-01-12 Merge branch 'nd/stop-setenv-work-tree'
2016-01-04 Merge branch 'jk/pending-keep-tag-name' into maint
2015-12-28 Merge branch 'jk/pending-keep-tag-name'
2015-12-22 Merge branch 'nd/stop-setenv-work-tree' into nd/clear...
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-12-15 Merge branch 'jk/prune-mtime' into maint
2015-12-15 Merge branch 'jk/prune-mtime'
2015-12-08 Merge branch 'ad/sha1-update-chunked' into maint
2015-12-08 Merge branch 'jk/rebase-no-autostash' into maint
2015-12-04 Merge branch 'da/difftool' into maint
2015-12-04 Merge branch 'ad/sha1-update-chunked'
2015-12-01 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05 Merge branch 'js/misc-fixes' into maint
2015-11-05 Merge branch 'jc/add-u-A-default-to-top' into maint
2015-11-05 Merge branch 'jk/delete-modechange-conflict' into maint
2015-11-05 Merge branch 'sa/send-email-smtp-batch-data-limit'...
next