merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / tmp-objdir.c
2016-10-26 Merge branch 'jc/ws-error-highlight'
2016-10-26 Merge branch 'jc/diff-unique-abbrev-comments'
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-10-17 Sync with maint
2016-10-17 Merge branch 'sb/submodule-config-doc-drop-path'
2016-10-17 Merge branch 'rs/pretty-format-color-doc-fix'
2016-10-17 Merge branch 'js/reset-usage'
2016-10-17 Merge branch 'da/mergetool-diff-order'
2016-10-17 Merge branch 'rs/cocci'
2016-10-17 Merge branch 'js/regexec-buf'
2016-10-17 Merge branch 'jk/ref-symlink-loop'
2016-10-17 Merge branch 'jk/quarantine-received-objects'
2016-10-10 tmp-objdir: do not migrate files starting with '.'
2016-10-10 tmp-objdir: put quarantine information in the environment
2016-10-10 tmp-objdir: introduce API for temporary object directories