difftool: handle unmerged files in dir-diff mode
[git] / lockfile.c
2016-05-06  Junio C HamanoMerge branch 'sb/submodule-path-misc-bugs' into maint
2016-05-06  Junio C HamanoMerge branch 'ky/imap-send-openssl-1.1.0' into maint
2016-05-06  Junio C HamanoMerge branch 'js/replace-edit-use-editor-configuration...
2016-05-06  Junio C HamanoMerge branch 'cc/apply' into maint
2016-05-06  Junio C HamanoMerge branch 'kn/for-each-tag-branch' into maint
2016-05-02  Junio C HamanoMerge branch 'jk/use-write-script-more' into maint
2016-05-02  Junio C HamanoMerge branch 'jc/xstrfmt-null-with-prec-0' into maint
2016-05-02  Junio C HamanoMerge branch 'ew/send-email-drop-data-dumper' into...
2016-05-02  Junio C HamanoMerge branch 'ad/cygwin-wants-rename' into maint
2016-05-02  Junio C HamanoMerge branch 'jk/do-not-printf-NULL' into maint
2016-05-02  Junio C HamanoMerge branch 'jc/http-socks5h' into maint
2016-05-02  Junio C HamanoMerge branch 'ky/imap-send' into maint
2016-05-02  Junio C HamanoMerge branch 'ad/commit-have-m-option' into maint
2016-05-02  Junio C HamanoMerge branch 'sb/submodule-helper-clone-regression...
2016-05-02  Junio C HamanoMerge branch 'jk/branch-shortening-funny-symrefs' into...
2016-05-02  Junio C HamanoMerge branch 'es/format-patch-doc-hide-no-patch' into...
2016-05-02  Junio C HamanoMerge branch 'ky/branch-m-worktree' into maint
2016-05-02  Junio C HamanoMerge branch 'ky/branch-d-worktree' into maint
2016-05-02  Junio C HamanoMerge branch 'jk/check-repository-format' into maint
2016-05-02  Junio C HamanoMerge branch 'ew/send-email-readable-message-id' into...
2016-04-29  Junio C HamanoMerge branch 'js/mingw-tests-2.8' into maint
2016-04-29  Junio C HamanoMerge branch 'ep/trace-doc-sample-fix' into maint
2016-04-29  Junio C HamanoMerge branch 'jc/makefile-redirection-stderr' into...
2016-04-29  Junio C HamanoMerge branch 'ak/use-hashmap-iter-first-in-submodule...
2016-04-29  Junio C HamanoMerge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-29  Junio C HamanoMerge branch 'sk/send-pack-all-fix' into maint
2016-04-29  Junio C HamanoMerge branch 'sg/diff-multiple-identical-renames' into...
2016-04-29  Junio C HamanoMerge branch 'ss/msvc' into maint
2016-04-25  Junio C HamanoMerge tag 'l10n-2.8.0-rnd3-fr' of git://github.com...
2016-04-15  Junio C HamanoMerge branch 'jv/merge-nothing-into-void' into maint
2016-04-15  Junio C HamanoMerge branch 'ss/commit-squash-msg' into maint
2016-04-15  Junio C HamanoMerge branch 'jk/send-email-rtrim-mailrc-alias' into...
2016-04-15  Junio C HamanoMerge branch 'da/mergetool-delete-delete-conflict'...
2016-04-15  Junio C HamanoMerge branch 'jk/startup-info' into maint
2016-04-15  Junio C HamanoMerge branch 'jk/getwholeline-getdelim-empty' into...
2016-04-15  Junio C HamanoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
2016-04-15  Junio C HamanoMerge branch 'gf/fetch-pack-direct-object-fetch' into...
2016-04-15  Junio C HamanoMerge branch 'jk/rev-parse-local-env-vars' into maint
2016-04-15  Junio C HamanoMerge branch 'jk/config-get-urlmatch' into maint
2016-04-15  Junio C HamanoMerge branch 'pb/t7502-drop-dup' into maint
2016-04-15  Junio C HamanoMerge branch 'jk/test-httpd-config-nosystem' into maint
2016-04-15  Junio C HamanoMerge branch 'sb/clone-t57-t56' into maint
2016-04-15  Junio C HamanoMerge branch 'jk/credential-cache-comment-exit' into...
2016-04-15  Junio C HamanoMerge branch 'jc/index-pack' into maint
2016-04-15  Junio C HamanoMerge branch 'ss/exc-flag-is-a-collection-of-bits'...
2016-04-15  Junio C HamanoMerge branch 'mp/upload-pack-use-embedded-args' into...
2016-04-15  Junio C HamanoMerge branch 'oa/doc-diff-check' into maint
2016-04-15  Junio C HamanoMerge branch 'pb/opt-cmdmode-doc' into maint
2016-04-15  Junio C HamanoMerge branch 'nd/apply-doc' into maint
2016-04-15  Junio C HamanoMerge branch 'cc/doc-recommend-performance-trace-to...
2016-04-15  Junio C HamanoMerge branch 'mm/lockfile-error-message' into maint
2016-03-21  Junio C HamanoMerge branch 'mm/doc-hooks-linkgit-fix' into maint
2016-03-21  Junio C HamanoMerge branch 'es/st-add4-gcc-4.2-workaround' into maint
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-17  Junio C HamanoMerge branch 'maint-2.5' into maint-2.6
2016-03-17  Junio C HamanoMerge branch 'maint-2.4' into maint-2.5
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.5' into jk/path...
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.4' into jk/path...
2016-03-14  Junio C HamanoMerge branch 'mg/wt-status-mismarked-i18n'
2016-03-10  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix' into...
2016-03-10  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test' into...
2016-03-10  Junio C HamanoMerge branch 'mm/push-simple-doc' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/more-comments-on-textconv' into maint
2016-03-10  Junio C HamanoMerge branch 'jk/no-diff-emit-common' into maint
2016-03-10  Junio C HamanoMerge branch 'jc/am-i-v-fix' into maint
2016-03-10  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into...
2016-03-10  Junio C HamanoMerge branch 'mg/work-tree-tests' into maint
2016-03-04  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-03-04  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety'
2016-03-03  Junio C HamanoMerge branch 'jc/maint-index-pack-keep' into jc/index...
2016-03-01  Matthieu Moylockfile: improve error message when lockfile exists
2016-03-01  Matthieu Moylockfile: mark strings for translation
2016-02-26  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix'
2016-02-26  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test'
2016-02-26  Junio C HamanoMerge branch 'mm/push-simple-doc'
2016-02-26  Junio C HamanoMerge branch 'mg/work-tree-tests'
2016-02-26  Junio C HamanoMerge branch 'jk/more-comments-on-textconv'
2016-02-26  Junio C HamanoMerge branch 'jk/no-diff-emit-common'
2016-02-26  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep'
2016-02-24  Junio C HamanoMerge branch 'jc/am-i-v-fix'
2016-02-24  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs'
2016-02-22  Junio C HamanoMerge branch 'js/git-remote-add-url-insteadof-test'
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-02-17  Junio C HamanoMerge branch 'jk/rerere-xsnprintf'
2016-02-17  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias'
2016-02-10  Junio C HamanoMerge branch 'wp/sha1-name-negative-match'
2016-02-05  Junio C HamanoMerge branch 'lv/add-doc-working-tree' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' into...
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint
2016-02-05  Junio C HamanoMerge branch 'tb/complete-word-diff-regex' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/sanity' into maint
2016-02-05  Junio C HamanoMerge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...
2016-02-05  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning' into...
2016-02-05  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' into maint
2016-02-05  Junio C HamanoMerge branch 'ew/send-email-mutt-alias-fix' into maint
next