difftool: handle unmerged files in dir-diff mode
[gitweb.git] / compat / apple-common-crypto.h
2015-12-28 Merge branch 'jk/symbolic-ref-maint'
2015-12-21 Merge branch 'bc/format-patch-null-from-line'
2015-12-21 Merge branch 'jk/send-email-ssl-errors'
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 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05 sha1: allow limiting the size of the data passed to...
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-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-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
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-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-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'jc/max-io-size-and-ssize-max'
2015-02-25 Merge branch 'tc/missing-http-proxyauth'
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into...
2015-02-17 Merge branch 'jk/status-read-branch-name-fix'
2015-02-17 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12 Merge branch 'mh/find-uniq-abbrev' into maint
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2015-01-07 Merge branch 'pd/completion-filenames-fix'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-12-22 Merge branch 'mh/find-uniq-abbrev'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
next