refs: convert update_ref and refs_update_ref to use struct object_id
[git/git.git] / builtin / merge.c
2017-10-16 brian m. carlsonrefs: convert update_ref and refs_update_ref to use...
2017-10-11 Junio C HamanoMerge branch 'ls/filter-process-delayed'
2017-10-11 Junio C HamanoMerge branch 'tb/complete-describe'
2017-10-11 Junio C HamanoMerge branch 'rs/rs-mailmap'
2017-10-11 Junio C HamanoMerge branch 'rs/fsck-null-return-from-lookup'
2017-10-11 Junio C HamanoMerge branch 'jk/sha1-loose-object-info-fix'
2017-10-09 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-10-07 Junio C HamanoMerge branch 'tb/ref-filter-empty-modifier'
2017-10-07 Junio C HamanoMerge branch 'ks/verify-filename-non-option-error-messa...
2017-10-07 Junio C HamanoMerge branch 'ks/branch-tweak-error-message-for-extra...
2017-10-07 Junio C HamanoMerge branch 'ma/builtin-unleak'
2017-10-07 Junio C HamanoMerge branch 'rb/compat-poll-fix'
2017-10-07 Junio C HamanoMerge branch 'tg/memfixes'
2017-10-07 Junio C HamanoMerge branch 'sb/branch-avoid-repeated-strbuf-release'
2017-10-07 Junio C HamanoMerge branch 'rs/qsort-s'
2017-10-07 Junio C HamanoMerge branch 'jn/strbuf-doc-re-reuse'
2017-10-05 Junio C HamanoMerge branch 'ar/request-pull-phrasofix'
2017-10-05 Junio C HamanoMerge branch 'rs/run-command-use-alloc-array'
2017-10-05 Junio C HamanoMerge branch 'sb/git-clang-format'
2017-10-05 Junio C HamanoMerge branch 'rs/tag-null-pointer-arith-fix'
2017-10-05 Junio C HamanoMerge branch 'rs/cocci-de-paren-call-params'
2017-10-05 Junio C HamanoMerge branch 'er/fast-import-dump-refs-on-checkpoint'
2017-10-04 Junio C HamanoMerge branch 'jk/ui-color-always-to-auto-maint' into...
2017-10-03 Junio C HamanoMerge branch 'bw/git-clang-format'
2017-10-03 Junio C HamanoMerge branch 'ad/doc-markup-fix'
2017-10-03 Junio C HamanoMerge branch 'mh/mmap-packed-refs'
2017-10-03 Junio C HamanoMerge branch 'mr/doc-negative-pathspec'
2017-10-03 Junio C HamanoMerge branch 'sb/diff-color-move'
2017-10-03 Junio C HamanoMerge branch 'jk/validate-headref-fix'
2017-10-03 Junio C HamanoMerge branch 'jk/no-optional-locks'
2017-10-03 Junio C HamanoMerge branch 'sd/branch-copy'
2017-10-03 Junio C HamanoMerge branch 'bc/rev-parse-parseopt-fix'
2017-10-03 Junio C HamanoMerge branch 'js/rebase-i-final'
2017-09-29 Junio C HamanoMerge branch 'ma/leakplugs'
2017-09-29 Junio C HamanoMerge branch 'rj/no-sign-compare'
2017-09-29 Junio C HamanoMerge branch 'sb/merge-commit-msg-hook'
2017-09-29 Junio C HamanoMerge branch 'jt/fast-export-copy-modify-fix'
2017-09-29 Junio C HamanoMerge branch 'jm/status-ignored-directory-optim'
2017-09-28 Junio C HamanoMerge branch 'js/win32-lazyload-dll'
2017-09-28 Junio C HamanoMerge branch 'jc/merge-x-theirs-docfix'
2017-09-28 Junio C HamanoMerge branch 'ks/doc-use-camelcase-for-config-name'
2017-09-28 Junio C HamanoMerge branch 'mk/diff-delta-avoid-large-offset'
2017-09-28 Junio C HamanoMerge branch 'mk/diff-delta-uint-may-be-shorter-than...
2017-09-28 Junio C HamanoMerge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28 Junio C HamanoMerge branch 'jk/doc-read-tree-table-asciidoctor-fix'
2017-09-28 Junio C HamanoMerge branch 'ik/userdiff-html-h-element-fix'
2017-09-28 Junio C HamanoMerge branch 'jk/diff-blob'
2017-09-28 Junio C HamanoMerge branch 'hn/typofix'
2017-09-28 Junio C HamanoMerge branch 'ic/fix-filter-branch-to-handle-tag-withou...
2017-09-28 Junio C HamanoMerge branch 'jk/describe-omit-some-refs'
2017-09-26 Junio C HamanoSync with 2.14.2
2017-09-25 Junio C HamanoMerge branch 'ks/test-readme-phrasofix'
2017-09-25 Junio C HamanoMerge branch 'ow/rev-parse-is-shallow-repo'
2017-09-25 Junio C HamanoMerge branch 'rj/test-ulimit-on-windows'
2017-09-25 Junio C HamanoMerge branch 'jk/info-alternates-fix'
2017-09-25 Junio C HamanoMerge branch 'mh/for-each-string-list-item-empty-fix'
2017-09-25 Junio C HamanoMerge branch 'tb/test-lint-echo-e'
2017-09-25 Junio C HamanoMerge branch 'ls/travis-scriptify'
2017-09-25 Junio C HamanoMerge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-25 Junio C HamanoMerge branch 'hv/mv-nested-submodules-test'
2017-09-25 Junio C HamanoMerge branch 'bw/git-clang-format'
2017-09-25 Junio C HamanoMerge branch 'nm/imap-send-with-curl'
2017-09-25 Junio C HamanoMerge branch 'ks/commit-do-not-touch-cut-line'
2017-09-25 Junio C HamanoMerge branch 'tg/refs-allowed-flags'
2017-09-25 Junio C HamanoMerge branch 'rs/archive-excluded-directory'
2017-09-25 Junio C HamanoMerge branch 'ks/help-alias-label'
2017-09-25 Junio C HamanoMerge branch 'jn/per-repo-object-store-fixes'
2017-09-25 Junio C HamanoMerge branch 'jk/write-in-full-fix'
2017-09-25 Junio C HamanoMerge branch 'ez/doc-duplicated-words-fix'
2017-09-25 Junio C HamanoMerge branch 'kd/doc-for-each-ref'
2017-09-25 Junio C HamanoMerge branch 'cc/subprocess-handshake-missing-capabilities'
2017-09-25 Junio C HamanoMerge branch 'kw/write-index-reduce-alloc'
2017-09-25 Junio C HamanoMerge branch 'mg/name-rev-tests-with-short-stack'
2017-09-22 Junio C HamanoSync with 2.13.6
2017-09-22 Junio C HamanoSync with 2.12.5
2017-09-22 Junio C HamanoSync with 2.11.4
2017-09-22 Junio C HamanoSync with 2.10.5
2017-09-22 Junio C HamanoMerge branch 'jk/safe-pipe-capture' into maint-2.10
2017-09-22 Junio C HamanoMerge branch 'jk/cvsimport-quoting' into maint-2.10
2017-09-22 Junio C HamanoMerge branch 'jc/cvsserver' into maint-2.10
2017-09-22 Junio C HamanoMerge branch 'jk/git-shell-drop-cvsserver' into maint...
2017-09-21 Junio C HamanoMerge branch 'jk/leak-checkers'
2017-09-20 Junio C HamanoMerge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-20 Junio C HamanoMerge branch 'jk/info-alternates-fix-2.11' into jk...
2017-09-19 Junio C HamanoMerge branch 'rk/commit-tree-make-F-verbatim'
2017-09-19 Junio C HamanoMerge branch 'rs/strbuf-leakfix'
2017-09-19 Junio C HamanoMerge branch 'jk/shortlog-ident-cleanup'
2017-09-19 Junio C HamanoMerge branch 'mh/packed-ref-transactions'
2017-09-19 Junio C HamanoMerge branch 'kw/merge-recursive-cleanup'
2017-09-19 Junio C HamanoMerge branch 'sb/merge-commit-msg-hook'
2017-09-19 Junio C HamanoMerge branch 'jk/leak-checkers'
2017-09-19 Junio C HamanoMerge branch 'nm/pull-submodule-recurse-config'
2017-09-19 Junio C HamanoMerge branch 'mh/packed-ref-store-prep'
2017-09-19 Junio C HamanoMerge branch 'ma/remove-config-maybe-bool'
2017-09-19 Junio C HamanoMerge branch 'jk/system-path-cleanup'
2017-09-19 Junio C HamanoMerge branch 'jh/hashmap-disable-counting'
2017-09-19 Junio C HamanoMerge branch 'bb/doc-eol-dirty'
2017-09-19 Junio C HamanoMerge branch 'jt/packmigrate'
2017-09-19 Junio C HamanoMerge branch 'jk/incore-lockfile-removal'
2017-09-19 Junio C HamanoMerge branch 'nd/prune-in-worktree'
next