merge-recursive: remove final remaining caller of merge_file_one()
[gitweb.git] / notes-cache.h
2017-06-22 Merge branch 'sd/t3200-branch-m-test'
2017-06-22 Merge branch 'ps/stash-push-pathspec-fix'
2017-06-22 Merge branch 'ls/github'
2017-06-22 Merge branch 'sg/revision-parser-skip-prefix'
2017-06-22 Merge branch 'km/test-mailinfo-b-failure'
2017-06-22 Merge branch 'pc/dir-count-slashes'
2017-06-22 Merge branch 'sb/t4005-modernize'
2017-06-22 Merge branch 'nd/fopen-errors'
2017-06-19 Merge branch 'jk/consistent-h'
2017-06-19 Merge branch 'sb/submodule-rm-absorb'
2017-06-19 Merge branch 'ab/pcre-v2'
2017-06-19 Merge branch 'jk/pathspec-magic-disambiguation'
2017-06-13 Sync with maint
2017-06-13 Merge branch 'jk/pack-idx-corruption-safety'
2017-06-13 Merge branch 'nd/fopen-errors'
2017-06-13 Merge branch 'rf/completion'
2017-06-13 Merge branch 'jc/diff-tree-stale-comment'
2017-06-13 Merge branch 'sb/submodule-blanket-recursive'
2017-06-13 Merge branch 'jc/noent-notdir'
2017-06-07 Sync with maint
2017-06-05 Sync with v2.13.1
2017-06-05 Merge branch 'ad/pull-remote-doc'
2017-06-05 Merge branch 'tb/pull-ff-rebase-autostash'
2017-06-05 Merge branch 'jk/drop-free-refspecs'
2017-06-05 Merge branch 'jk/connect-symref-info-leak-fix'
2017-06-05 Merge branch 'js/blame-lib'
2017-06-05 Merge branch 'mb/diff-default-to-indent-heuristics'
2017-06-05 Merge branch 'jh/close-index-before-stat'
2017-06-04 Sync with maint
2017-06-04 Merge branch 'jk/url-insteadof-config'
2017-06-04 Merge branch 'ah/doc-rev-parse-short-default'
2017-06-04 Merge branch 'rf/completion-config-commit'
2017-06-04 Merge branch 'ab/c-translators-comment-style'
2017-06-04 Merge branch 'jk/unbreak-am-h'
2017-06-04 Merge branch 'ab/t3070-test-dedup'
2017-06-04 Merge branch 'ah/doc-filter-branch-export-env'
2017-06-04 Merge branch 'sd/t3200-typofix'
2017-06-04 Merge branch 'ab/sha1dc-maint'
2017-06-02 Merge branch 'ab/grep-preparatory-cleanup'
2017-06-02 Merge branch 'jk/diff-blob'
2017-06-02 Merge branch 'sl/clean-d-ignored-fix'
2017-06-02 Merge branch 'sb/t5531-update-desc'
2017-06-02 Merge branch 'ah/doc-pretty-format-fix'
2017-06-02 Merge branch 'ah/doc-interpret-trailers-ifexists'
2017-06-02 Merge branch 'rs/mingw-path-lookup-simplify'
2017-06-02 Merge branch 'ab/ref-filter-no-contains'
2017-06-02 Merge branch 'jt/send-email-validate-hook'
2017-06-02 Merge branch 'dk/send-email-avoid-net-smtp-ssl-when...
2017-06-02 Merge branch 'js/bs-is-a-dir-sep-on-windows'
2017-05-30 Merge branch 'dt/unpack-save-untracked-cache-extension'
2017-05-30 Merge branch 'js/larger-timestamps'
2017-05-30 Merge branch 'dk/send-email-avoid-net-smtp-ssl-when...
2017-05-30 Merge branch 'jc/skip-test-in-the-middle'
2017-05-30 Merge branch 'ab/conditional-config-with-symlinks'
2017-05-30 Merge branch 'jt/fetch-allow-tip-sha1-implicitly'
2017-05-30 Merge branch 'jt/send-email-validate-hook'
2017-05-30 Merge branch 'jh/memihash-opt'
2017-05-30 Merge branch 'bp/sub-process-convert-filter'
2017-05-30 Merge branch 'bw/forking-and-threading'
2017-05-30 Merge branch 'ab/perf-wildmatch'
2017-05-30 Merge branch 'jc/name-rev-lw-tag'
2017-05-30 Merge branch 'bw/pathspec-sans-the-index'
2017-05-29 Merge branch 'jk/ignore-broken-tags-when-ignoring-missi...
2017-05-29 Merge branch 'jk/alternate-ref-optim'
2017-05-29 Merge branch 'bm/interpret-trailers-cut-line-is-eom'
2017-05-29 Merge branch 'tg/stash-push-fixup'
2017-05-29 Merge branch 'pw/rebase-i-regression-fix'
2017-05-29 Merge branch 'kn/ref-filter-branch-list'
2017-05-29 Merge branch 'km/log-showsignature-doc'
2017-05-29 Merge branch 'jk/update-links-in-docs'
2017-05-29 Merge branch 'ja/do-not-ask-needless-questions'
2017-05-29 Merge branch 'jk/doc-config-include'
2017-05-29 Merge branch 'sg/core-filemode-doc-typofix'
2017-05-29 Merge branch 'jk/bug-to-abort'
2017-05-29 Merge branch 'js/eol-on-ourselves'
2017-05-29 Merge branch 'jc/read-tree-empty-with-m'
2017-05-29 Merge branch 'js/plug-leaks'
2017-05-29 Merge branch 'jk/disable-pack-reuse-when-broken'
2017-05-29 Merge branch 'bc/object-id'
2017-05-23 Merge branch 'bc/object-id'
2017-05-08 notes-cache: convert to struct object_id
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2016-10-20 Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
2016-09-26 Merge branch 'va/i18n' of ../git-gui into va/git-gui...
2016-09-26 Merge branch 'rs/use-modern-git-merge-syntax' of git...
2016-09-11 Merge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09 Merge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-07 Merge branch 'sy/i18n' of git-gui
2016-08-31 Merge branch 'ls/packet-line-protocol-doc-fix'
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
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-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
next