Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows
[gitweb.git] / notes-merge.c
2017-06-22 Merge branch 'km/test-mailinfo-b-failure'
2017-06-22 Merge branch 'ah/filter-branch-setup'
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 'ab/perf-remove-index-lock'
2017-06-19 Merge branch 'bw/object-id'
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-13 Merge branch 'jk/connect-symref-info-leak-fix' into...
2017-06-13 Merge branch 'ab/t3070-test-dedup' into maint
2017-06-13 Merge branch 'jh/memihash-opt' into maint
2017-06-13 Merge branch 'jh/close-index-before-stat' into maint
2017-06-13 Merge branch 'sl/clean-d-ignored-fix' into maint
2017-06-13 Merge branch 'dk/send-email-avoid-net-smtp-ssl-when...
2017-06-13 Merge branch 'bw/forking-and-threading' into maint
2017-06-07 Sync with maint
2017-06-05 diff-tree: convert diff_tree_sha1 to struct object_id
2017-06-05 notes-merge: convert write_note_to_worktree to struct...
2017-06-05 notes-merge: convert verify_notes_filepair to struct...
2017-06-05 notes-merge: convert find_notes_merge_pair_ps to struct...
2017-06-05 notes-merge: convert merge_from_diffs to struct object_id
2017-06-05 notes-merge: convert notes_merge* to struct object_id
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-05 Merge branch 'ah/doc-filter-branch-export-env' into...
2017-06-05 Merge branch 'sd/t3200-typofix' into maint
2017-06-05 Merge branch 'sb/t5531-update-desc' into maint
2017-06-05 Merge branch 'ah/doc-pretty-format-fix' into maint
2017-06-05 Merge branch 'ah/doc-interpret-trailers-ifexists' into...
2017-06-05 Merge branch 'ab/ref-filter-no-contains' into maint
2017-06-05 Merge branch 'sg/core-filemode-doc-typofix' into maint
2017-06-05 Merge branch 'jn/credential-doc-on-clear' into maint
2017-06-05 Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint
2017-06-05 Merge branch 'jk/alternate-ref-optim' into maint
2017-06-05 Merge branch 'kn/ref-filter-branch-list' into maint
2017-06-05 Merge branch 'rs/checkout-am-fix-unborn' into maint
2017-06-05 Merge branch 'jn/clone-add-empty-config-from-command...
2017-06-05 Merge branch 'ls/travis-doc-asciidoctor' into maint
2017-06-04 Sync with maint
2017-06-04 Merge branch 'tg/stash-push-fixup' into maint
2017-06-04 Merge branch 'km/log-showsignature-doc' into maint
2017-06-04 Merge branch 'jt/use-trailer-api-in-commands' into...
2017-06-04 Merge branch 'jt/push-options-doc' into maint
2017-06-04 Merge branch 'jk/update-links-in-docs' into maint
2017-06-04 Merge branch 'jk/ignore-broken-tags-when-ignoring-missi...
2017-06-04 Merge branch 'jk/disable-pack-reuse-when-broken' into...
2017-06-04 Merge branch 'jk/am-leakfix' into maint
2017-06-04 Merge branch 'jc/read-tree-empty-with-m' into maint
2017-06-04 Merge branch 'jc/apply-fix-mismerge' into maint
2017-06-04 Merge branch 'ja/do-not-ask-needless-questions' into...
2017-06-04 Merge branch 'bw/submodule-with-bs-path' into maint
2017-06-04 Merge branch 'ah/log-decorate-default-to-auto' into...
2017-06-04 Merge branch 'ab/aix-needs-compat-regex' into maint
2017-06-04 Merge branch 'pw/rebase-i-regression-fix' into 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-06-02 notes: convert some accessor functions to struct object_id
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'
next