Andrew's git / gitweb.git / history
?
Sync with maint
[gitweb.git] / builtin / merge-tree.c
2017-06-04 Sync with maint blob | diff | raw
2017-06-04 Merge branch 'jk/url-insteadof-config' blob | diff | raw
2017-06-04 Merge branch 'ah/doc-rev-parse-short-default' blob | diff | raw
2017-06-04 Merge branch 'rf/completion-config-commit' blob | diff | raw
2017-06-04 Merge branch 'ab/c-translators-comment-style' blob | diff | raw
2017-06-04 Merge branch 'jk/unbreak-am-h' blob | diff | raw
2017-06-04 Merge branch 'ab/t3070-test-dedup' blob | diff | raw
2017-06-04 Merge branch 'ah/doc-filter-branch-export-env' blob | diff | raw
2017-06-04 Merge branch 'sd/t3200-typofix' blob | diff | raw
2017-06-04 Merge branch 'ab/sha1dc-maint' blob | diff | raw
2017-06-02 Merge branch 'ab/grep-preparatory-cleanup' blob | diff | raw
2017-06-02 Merge branch 'jk/diff-blob' blob | diff | raw
2017-06-02 Merge branch 'sl/clean-d-ignored-fix' blob | diff | raw
2017-06-02 Merge branch 'sb/t5531-update-desc' blob | diff | raw
2017-06-02 Merge branch 'ah/doc-pretty-format-fix' blob | diff | raw
2017-06-02 Merge branch 'ah/doc-interpret-trailers-ifexists' blob | diff | raw
2017-06-02 Merge branch 'rs/mingw-path-lookup-simplify' blob | diff | raw
2017-06-02 Merge branch 'ab/ref-filter-no-contains' blob | diff | raw
2017-06-02 Merge branch 'jt/send-email-validate-hook' blob | diff | raw
2017-06-02 Merge branch 'dk/send-email-avoid-net-smtp-ssl-when... blob | diff | raw
2017-06-02 Merge branch 'js/bs-is-a-dir-sep-on-windows' blob | diff | raw
2017-05-30 Merge branch 'dt/unpack-save-untracked-cache-extension' blob | diff | raw
2017-05-30 Merge branch 'js/larger-timestamps' blob | diff | raw
2017-05-30 Merge branch 'dk/send-email-avoid-net-smtp-ssl-when... blob | diff | raw
2017-05-30 Merge branch 'jc/skip-test-in-the-middle' blob | diff | raw
2017-05-30 Merge branch 'ab/conditional-config-with-symlinks' blob | diff | raw
2017-05-30 Merge branch 'jt/fetch-allow-tip-sha1-implicitly' blob | diff | raw
2017-05-30 Merge branch 'jt/send-email-validate-hook' blob | diff | raw
2017-05-30 Merge branch 'jh/memihash-opt' blob | diff | raw
2017-05-30 Merge branch 'bp/sub-process-convert-filter' blob | diff | raw
2017-05-30 Merge branch 'bw/forking-and-threading' blob | diff | raw
2017-05-30 Merge branch 'ab/perf-wildmatch' blob | diff | raw
2017-05-30 Merge branch 'bw/pathspec-sans-the-index' blob | diff | raw
2017-05-30 Merge branch 'jc/name-rev-lw-tag' blob | diff | raw
2017-05-29 Merge branch 'jk/ignore-broken-tags-when-ignoring-missi... blob | diff | raw
2017-05-29 Merge branch 'jk/alternate-ref-optim' blob | diff | raw
2017-05-29 Merge branch 'bm/interpret-trailers-cut-line-is-eom' blob | diff | raw
2017-05-29 Merge branch 'tg/stash-push-fixup' blob | diff | raw
2017-05-29 Merge branch 'pw/rebase-i-regression-fix' blob | diff | raw
2017-05-29 Merge branch 'kn/ref-filter-branch-list' blob | diff | raw
2017-05-29 Merge branch 'km/log-showsignature-doc' blob | diff | raw
2017-05-29 Merge branch 'jk/update-links-in-docs' blob | diff | raw
2017-05-29 Merge branch 'ja/do-not-ask-needless-questions' blob | diff | raw
2017-05-29 Merge branch 'jk/doc-config-include' blob | diff | raw
2017-05-29 Merge branch 'sg/core-filemode-doc-typofix' blob | diff | raw
2017-05-29 Merge branch 'jk/bug-to-abort' blob | diff | raw
2017-05-29 Merge branch 'js/eol-on-ourselves' blob | diff | raw
2017-05-29 Merge branch 'jc/read-tree-empty-with-m' blob | diff | raw
2017-05-29 Merge branch 'js/plug-leaks' blob | diff | raw
2017-05-29 Merge branch 'jk/disable-pack-reuse-when-broken' blob | diff | raw
2017-05-29 Merge branch 'bc/object-id' blob | diff | raw
2017-05-08 Convert lookup_blob to struct object_id blob | diff | raw
2017-05-08 Convert remaining callers of lookup_blob to object_id blob | diff | raw | diff to current
2017-05-05 Merge branch 'maint-2.8' into maint-2.9 blob | diff | raw | diff to current
2017-05-05 Merge branch 'maint-2.6' into maint-2.7 blob | diff | raw | diff to current
2017-05-01 Merge branch 'jk/prio-queue-avoid-swap-with-self' blob | diff | raw | diff to current
2017-04-24 Merge branch 'xy/format-patch-base' blob | diff | raw | diff to current
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed' blob | diff | raw | diff to current
2017-04-17 Merge branch 'jc/unused-symbols' blob | diff | raw | diff to current
2017-04-11 Merge branch 'cc/untracked' blob | diff | raw | diff to current
2017-03-30 Merge branch 'bc/push-cert-receive-fix' blob | diff | raw | diff to current
2017-03-30 Merge branch 'jc/merge-drop-old-syntax' blob | diff | raw | diff to current
2017-03-28 Merge branch 'rs/path-name-safety-cleanup' into maint blob | diff | raw | diff to current
2017-03-28 Merge branch 'js/regexec-buf' into maint blob | diff | raw | diff to current
2017-03-24 Merge branch 'rs/path-name-safety-cleanup' blob | diff | raw | diff to current
2017-03-24 Merge branch 'js/regexec-buf' blob | diff | raw | diff to current
2017-03-21 Merge branch 'jc/diff-populate-filespec-size-only-fix... blob | diff | raw | diff to current
2017-03-21 Merge branch 'jk/ewah-use-right-type-in-sizeof' into... blob | diff | raw | diff to current
2017-03-13 Merge branch 'jc/diff-populate-filespec-size-only-fix' blob | diff | raw | diff to current
2017-03-13 Merge branch 'jk/ewah-use-right-type-in-sizeof' blob | diff | raw | diff to current
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached' blob | diff | raw | diff to current
2017-02-24 Merge branch 'rt/align-add-i-help-text' blob | diff | raw | diff to current
2017-02-24 Merge branch 'bc/blame-doc-fix' blob | diff | raw | diff to current
2017-02-16 Merge branch 'ls/p4-path-encoding' blob | diff | raw | diff to current
2017-02-15 Merge branch 'sb/doc-unify-bottom' blob | diff | raw | diff to current
2017-02-10 Merge branch 'ps/worktree-prune-help-fix' blob | diff | raw | diff to current
2017-02-02 Merge branch 'mm/reset-facl-before-umask-test' blob | diff | raw | diff to current
2017-02-02 Merge branch 'ws/request-pull-code-cleanup' into maint blob | diff | raw | diff to current
2017-01-31 Merge branch 'ad/bisect-terms' into maint blob | diff | raw | diff to current
2017-01-31 Merge branch 'jk/grep-e-could-be-extended-beyond-posix... blob | diff | raw | diff to current
2017-01-31 Merge branch 'km/branch-get-push-while-detached' into... blob | diff | raw | diff to current
2017-01-31 Merge branch 'jc/latin-1' into maint blob | diff | raw | diff to current
2017-01-31 Merge branch 'jk/vreport-sanitize' blob | diff | raw | diff to current
2017-01-23 Merge branch 'ws/request-pull-code-cleanup' blob | diff | raw | diff to current
2017-01-23 Merge branch 'ad/bisect-terms' blob | diff | raw | diff to current
2017-01-23 Merge branch 'jk/grep-e-could-be-extended-beyond-posix' blob | diff | raw | diff to current
2017-01-18 Merge branch 'sb/remove-gitview' blob | diff | raw | diff to current
2017-01-18 Merge branch 'km/branch-get-push-while-detached' blob | diff | raw | diff to current
2017-01-18 Merge git://ozlabs.org/~paulus/gitk blob | diff | raw | diff to current
2017-01-17 Merge branch 'mm/gc-safety-doc' into maint blob | diff | raw | diff to current
2017-01-17 Merge branch 'mm/push-social-engineering-attack-doc... blob | diff | raw | diff to current
2017-01-17 Merge branch 'jt/fetch-no-redundant-tag-fetch-map'... blob | diff | raw | diff to current
2017-01-17 Merge branch 'lr/doc-fix-cet' into maint blob | diff | raw | diff to current
2017-01-17 Merge branch 'sb/t3600-cleanup' into maint blob | diff | raw | diff to current
2017-01-17 Merge branch 'sb/unpack-trees-grammofix' into maint blob | diff | raw | diff to current
2017-01-17 Merge branch 'mk/mingw-winansi-ttyname-termination... blob | diff | raw | diff to current
2017-01-17 Merge branch 'jc/push-default-explicit' into maint blob | diff | raw | diff to current
2017-01-17 Merge branch 'jc/pull-rebase-ff' into maint blob | diff | raw | diff to current
2017-01-17 Merge branch 'jc/renormalize-merge-kill-safer-crlf... blob | diff | raw | diff to current
2017-01-17 Merge branch 'bb/unicode-9.0' into maint blob | diff | raw | diff to current
next