diff: convert diff_change to struct object_id
[gitweb.git] / builtin / merge-file.c
2017-03-30 Merge branch 'jk/no-looking-at-dotgit-outside-repo...
2017-03-30 Merge branch 'jc/merge-drop-old-syntax'
2017-03-28 Sync with 'maint'
2017-03-28 Merge branch 'jk/sha1dc'
2017-03-28 Merge branch 'jh/memihash-opt'
2017-03-28 Merge branch 'jk/fast-import-cleanup'
2017-03-28 Merge branch 'sg/skip-prefix-in-prettify-refname'
2017-03-28 Merge branch 'ab/branch-list-doc'
2017-03-28 Merge branch 'jk/pager-in-use'
2017-03-28 Merge branch 'tg/stash-push-fixup'
2017-03-28 Merge branch 'sb/checkout-recurse-submodules'
2017-03-28 Merge branch 'bw/grep-recurse-submodules'
2017-03-28 Merge branch 'rs/path-name-safety-cleanup' into maint
2017-03-28 Merge branch 'js/regexec-buf' into maint
2017-03-27 Merge branch 'km/config-grammofix'
2017-03-27 Merge branch 'sb/t3600-rephrase'
2017-03-27 Merge branch 'sb/describe-broken'
2017-03-27 Merge branch 'sb/push-options-via-transport'
2017-03-27 Merge branch 'km/t1400-modernization'
2017-03-27 Merge branch 'jk/prefix-filename'
2017-03-24 Merge branch 'rs/path-name-safety-cleanup'
2017-03-24 Merge branch 'js/regexec-buf'
2017-03-21 Merge branch 'jc/diff-populate-filespec-size-only-fix...
2017-03-21 Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-21 prefix_filename: return newly allocated string
2017-03-21 prefix_filename: drop length parameter
2017-03-13 Merge branch 'jc/diff-populate-filespec-size-only-fix'
2017-03-13 Merge branch 'jk/ewah-use-right-type-in-sizeof'
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached'
2017-02-24 Merge branch 'rt/align-add-i-help-text'
2017-02-24 Merge branch 'bc/blame-doc-fix'
2017-02-16 Merge branch 'ls/p4-path-encoding'
2017-02-15 Merge branch 'sb/doc-unify-bottom'
2017-02-10 Merge branch 'ps/worktree-prune-help-fix'
2017-02-02 Merge branch 'mm/reset-facl-before-umask-test'
2017-02-02 Merge branch 'ws/request-pull-code-cleanup' into maint
2017-01-31 Merge branch 'ad/bisect-terms' into maint
2017-01-31 Merge branch 'jk/grep-e-could-be-extended-beyond-posix...
2017-01-31 Merge branch 'km/branch-get-push-while-detached' into...
2017-01-31 Merge branch 'jc/latin-1' into maint
2017-01-31 Merge branch 'jk/vreport-sanitize'
2017-01-23 Merge branch 'ws/request-pull-code-cleanup'
2017-01-23 Merge branch 'ad/bisect-terms'
2017-01-23 Merge branch 'jk/grep-e-could-be-extended-beyond-posix'
2017-01-18 Merge branch 'sb/remove-gitview'
2017-01-18 Merge branch 'km/branch-get-push-while-detached'
2017-01-18 Merge git://ozlabs.org/~paulus/gitk
2017-01-17 Merge branch 'mm/gc-safety-doc' into maint
2017-01-17 Merge branch 'mm/push-social-engineering-attack-doc...
2017-01-17 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'...
2017-01-17 Merge branch 'lr/doc-fix-cet' into maint
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint
2017-01-17 Merge branch 'sb/unpack-trees-grammofix' into maint
2017-01-17 Merge branch 'mk/mingw-winansi-ttyname-termination...
2017-01-17 Merge branch 'jc/push-default-explicit' into maint
2017-01-17 Merge branch 'jc/pull-rebase-ff' into maint
2017-01-17 Merge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17 Merge branch 'bb/unicode-9.0' into maint
2017-01-10 Merge branch 'mm/gc-safety-doc'
2017-01-10 Merge branch 'mm/push-social-engineering-attack-doc'
2017-01-10 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'
2017-01-10 Merge branch 'jc/latin-1'
2016-12-27 Merge branch 'ls/p4-lfs'
2016-12-27 Merge branch 'mk/mingw-winansi-ttyname-termination...
2016-12-27 Merge branch 'jc/push-default-explicit'
2016-12-19 Merge branch 'lr/doc-fix-cet'
2016-12-19 Merge branch 'sb/t3600-cleanup'
2016-12-19 Merge branch 'jc/pull-rebase-ff'
2016-12-19 Merge branch 'bb/unicode-9.0'
2016-12-19 Merge branch 'nd/rebase-forget'
2016-12-19 Merge branch 'sb/unpack-trees-grammofix'
2016-12-19 Merge branch 'jc/renormalize-merge-kill-safer-crlf'
2016-11-29 Merge branch 'tk/diffcore-delta-remove-unused' into...
2016-11-29 Merge branch 'nd/worktree-lock' into maint
2016-11-29 Merge branch 'ps/common-info-doc' into maint
2016-11-29 Merge branch 'nd/test-helpers' into maint
2016-11-29 Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
2016-11-29 Merge branch 'rs/commit-pptr-simplify' into maint
2016-11-29 Merge branch 'jk/rebase-config-insn-fmt-docfix' into...
2016-11-29 Merge branch 'jk/daemon-path-ok-check-truncation' into...
2016-11-29 Merge branch 'mm/send-email-cc-cruft-after-address...
2016-11-23 Merge branch 'js/rebase-i-commentchar-fix'
2016-11-23 Merge branch 'jc/for-each-ref-head-segfault-fix'
2016-11-17 Merge branch 'tk/diffcore-delta-remove-unused'
2016-11-17 Merge branch 'nd/worktree-lock'
2016-11-11 Merge branch 'ps/common-info-doc'
2016-10-31 Merge branch 'nd/test-helpers'
2016-10-31 Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31 Merge branch 'rs/commit-pptr-simplify'
2016-10-31 Merge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-28 Merge branch 'rs/pretty-format-color-doc-fix' into...
2016-10-28 Merge branch 'js/reset-usage' into maint
2016-10-28 Merge branch 'po/fix-doc-merge-base-illustration' into...
2016-10-28 Merge branch 'jk/tap-verbose-fix' into maint
2016-10-28 Merge branch 'jk/tighten-alloc' into maint
2016-10-28 Merge branch 'jk/merge-base-fork-point-without-reflog...
2016-10-28 Merge branch 'sb/submodule-config-doc-drop-path' into...
2016-10-28 Merge branch 'nd/commit-p-doc' into maint
2016-10-28 Merge branch 'jk/clone-copy-alternates-fix' into maint
2016-10-28 Merge branch 'ak/curl-imap-send-explicit-scheme' into...
next