Andrew's git - gitweb.git/history - builtin/merge-index.c

[gitweb.git] / builtin / merge-index.c

2017-06-26	Merge branch 'jk/add-p-commentchar-fix'	blob \| diff \| raw
2017-06-24	Merge branch 'sg/doc-pretty-formats' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'sg/revision-parser-skip-prefix' into...	blob \| diff \| raw
2017-06-24	Merge branch 'km/test-mailinfo-b-failure' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'sb/submodule-rm-absorb' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'jc/diff-tree-stale-comment' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'ps/stash-push-pathspec-fix' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'jc/name-rev-lw-tag' into maint	blob \| diff \| raw
2017-06-24	Merge branch 'sg/doc-pretty-formats'	blob \| diff \| raw
2017-06-24	Merge branch 'rs/pretty-add-again'	blob \| diff \| raw
2017-06-24	Merge branch 'ab/wildmatch-glob-slash-test'	blob \| diff \| raw
2017-06-22	Merge branch 'ps/stash-push-pathspec-fix'	blob \| diff \| raw
2017-06-22	Merge branch 'sg/revision-parser-skip-prefix'	blob \| diff \| raw
2017-06-22	Merge branch 'km/test-mailinfo-b-failure'	blob \| diff \| raw
2017-06-22	Merge branch 'sb/t4005-modernize'	blob \| diff \| raw
2017-06-19	Merge branch 'sb/submodule-rm-absorb'	blob \| diff \| raw
2017-06-13	Merge branch 'jk/pack-idx-corruption-safety'	blob \| diff \| raw
2017-06-13	Merge branch 'jc/diff-tree-stale-comment'	blob \| diff \| raw
2017-06-13	Merge branch 'jc/noent-notdir'	blob \| diff \| raw
2017-06-13	Merge branch 'jk/connect-symref-info-leak-fix' into...	blob \| diff \| raw
2017-06-13	Merge branch 'ab/t3070-test-dedup' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'jh/memihash-opt' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'jh/close-index-before-stat' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'sl/clean-d-ignored-fix' into maint	blob \| diff \| raw
2017-06-13	Merge branch 'dk/send-email-avoid-net-smtp-ssl-when...	blob \| diff \| raw
2017-06-13	Merge branch 'bw/forking-and-threading' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'jk/connect-symref-info-leak-fix'	blob \| diff \| raw
2017-06-05	Merge branch 'jh/close-index-before-stat'	blob \| diff \| raw
2017-06-05	Merge branch 'ah/doc-filter-branch-export-env' into...	blob \| diff \| raw
2017-06-05	Merge branch 'sd/t3200-typofix' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'sb/t5531-update-desc' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'ah/doc-pretty-format-fix' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'ah/doc-interpret-trailers-ifexists' into...	blob \| diff \| raw
2017-06-05	Merge branch 'ab/ref-filter-no-contains' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'sg/core-filemode-doc-typofix' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'jn/credential-doc-on-clear' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'jk/alternate-ref-optim' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'kn/ref-filter-branch-list' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'rs/checkout-am-fix-unborn' into maint	blob \| diff \| raw
2017-06-05	Merge branch 'jn/clone-add-empty-config-from-command...	blob \| diff \| raw
2017-06-05	Merge branch 'ls/travis-doc-asciidoctor' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'tg/stash-push-fixup' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'km/log-showsignature-doc' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jt/use-trailer-api-in-commands' into...	blob \| diff \| raw
2017-06-04	Merge branch 'jt/push-options-doc' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jk/update-links-in-docs' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jk/ignore-broken-tags-when-ignoring-missi...	blob \| diff \| raw
2017-06-04	Merge branch 'jk/disable-pack-reuse-when-broken' into...	blob \| diff \| raw
2017-06-04	Merge branch 'jk/am-leakfix' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jc/read-tree-empty-with-m' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'jc/apply-fix-mismerge' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'ja/do-not-ask-needless-questions' into...	blob \| diff \| raw
2017-06-04	Merge branch 'bw/submodule-with-bs-path' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'ah/log-decorate-default-to-auto' into...	blob \| diff \| raw
2017-06-04	Merge branch 'ab/aix-needs-compat-regex' into maint	blob \| diff \| raw
2017-06-04	Merge branch 'pw/rebase-i-regression-fix' into maint	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-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 'ab/ref-filter-no-contains'	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 'dk/send-email-avoid-net-smtp-ssl-when...	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 '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 '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 'sg/core-filemode-doc-typofix'	blob \| diff \| raw
2017-05-29	Merge branch 'jc/read-tree-empty-with-m'	blob \| diff \| raw
2017-05-29	Merge branch 'jk/disable-pack-reuse-when-broken'	blob \| diff \| raw
2017-05-29	Merge branch 'jk/diff-submodule-diff-inline'	blob \| diff \| raw
2017-05-29	Merge branch 'jc/repack-threads'	blob \| diff \| raw
2017-05-29	Merge branch 'sb/reset-recurse-submodules'	blob \| diff \| raw
2017-05-23	Merge branch 'jt/push-options-doc'	blob \| diff \| raw
2017-05-23	Merge branch 'rs/checkout-am-fix-unborn'	blob \| diff \| raw
2017-05-23	Merge branch 'ls/travis-relays-for-windows-ci'	blob \| diff \| raw
2017-05-23	Merge branch 'ah/log-decorate-default-to-auto'	blob \| diff \| raw
2017-05-23	Merge branch 'bw/submodule-with-bs-path'	blob \| diff \| raw
2017-05-16	Merge branch 'jc/apply-fix-mismerge'	blob \| diff \| raw
2017-05-16	Merge branch 'ab/aix-needs-compat-regex'	blob \| diff \| raw
2017-05-16	Merge branch 'jn/credential-doc-on-clear'	blob \| diff \| raw
2017-05-16	Merge branch 'jn/clone-add-empty-config-from-command...	blob \| diff \| raw
2017-05-16	Merge branch 'ls/travis-doc-asciidoctor'	blob \| diff \| raw
2017-05-16	Merge branch 'rs/large-zip'	blob \| diff \| raw
2017-05-16	Merge branch 'ab/clone-no-tags'	blob \| diff \| raw
2017-05-16	Merge branch 'jk/am-leakfix'	blob \| diff \| raw
next