difftool: handle unmerged files in dir-diff mode
[gitweb.git] / compat / sha1-chunked.c
2015-12-21 Merge branch 'sg/completion-no-column'
2015-12-21 Merge branch 'mc/push-recurse-submodules-config'
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-12-16 Merge branch 'sg/lock-file-commit-error' into maint
2015-12-15 Merge branch 'dt/fsck-verify-pack-error' into maint
2015-12-15 Merge branch 'ep/ident-with-getaddrinfo' into maint
2015-12-15 Merge branch 'ls/p4-keep-empty-commits' into maint
2015-12-15 Merge branch 'jk/send-email-complete-aliases'
2015-12-15 Merge branch 'ep/ident-with-getaddrinfo'
2015-12-15 Merge branch 'jk/prune-mtime' into maint
2015-12-15 Merge branch 'ls/p4-keep-empty-commits'
2015-12-15 Merge branch 'jk/prune-mtime'
2015-12-11 Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11 Merge branch 'sg/lock-file-commit-error' into maint
2015-12-11 Merge branch 'cb/t3404-shellquote' into maint
2015-12-11 Merge branch 'sb/doc-submodule-sync-recursive' into...
2015-12-11 Merge branch 'nd/doc-check-ref-format-typo' into maint
2015-12-11 Merge branch 'rs/show-branch-argv-array' into maint
2015-12-11 Merge branch 'rs/pop-commit' into maint
2015-12-11 Merge branch 'as/subtree-with-spaces' into maint
2015-12-11 Merge branch 'jk/test-lint-forbid-when-finished-in...
2015-12-11 Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
2015-12-11 Merge branch 'sb/doc-submodule-sync-recursive'
2015-12-11 Merge branch 'cb/t3404-shellquote'
2015-12-11 Merge branch 'sg/lock-file-commit-error'
2015-12-11 Merge branch 'master' of git://github.com/git-l10n...
2015-12-10 Merge branch 'nd/doc-check-ref-format-typo'
2015-12-10 Merge branch 'bc/object-id'
2015-12-10 Merge branch 'dt/fsck-verify-pack-error'
2015-12-10 Merge branch 'ls/travis-yaml'
2015-12-08 Merge branch 'ep/ident-with-getaddrinfo'
2015-12-08 Merge branch 'ls/test-must-fail-sigpipe'
2015-12-08 Merge branch 'dt/refs-backend-pre-vtable'
2015-12-08 Merge branch 'rs/status-detached-head-memcmp' into...
2015-12-08 Merge branch 'ad/sha1-update-chunked' into maint
2015-12-04 Sync with maint
2015-12-04 Merge branch 'sg/bash-prompt-dirty-orphan'
2015-12-04 Merge branch 'np/credential-cache-sighup'
2015-12-04 Merge branch 'rs/parseopt-short-help'
2015-12-04 Merge branch 'jk/send-email-complete-aliases'
2015-12-04 Merge branch 'jk/filter-branch-no-index'
2015-12-04 Merge branch 'ad/sha1-update-chunked'
2015-11-05 sha1: allow limiting the size of the data passed to...