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

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

2017-08-22	Merge branch 'rs/strbuf-getwholeline-fix'	blob \| diff \| raw
2017-08-22	Merge branch 'rs/fsck-obj-leakfix'	blob \| diff \| raw
2017-08-22	Merge branch 'rs/t4062-obsd'	blob \| diff \| raw
2017-08-22	Merge branch 'rs/find-pack-entry-bisection'	blob \| diff \| raw
2017-08-22	Merge branch 'rs/apply-lose-prefix-length'	blob \| diff \| raw
2017-08-22	Merge branch 'rj/add-chmod-error-message'	blob \| diff \| raw
2017-08-22	Merge branch 'jk/hashcmp-memcmp'	blob \| diff \| raw
2017-08-22	Merge branch 'jk/drop-sha1-entry-pos'	blob \| diff \| raw
2017-08-22	Merge branch 'rs/t3700-clean-leftover'	blob \| diff \| raw
2017-08-22	Merge branch 'jc/perl-git-comment-typofix'	blob \| diff \| raw
2017-08-22	Merge branch 'rs/obsd-getcwd-workaround'	blob \| diff \| raw
2017-08-22	Merge branch 'ma/parse-maybe-bool'	blob \| diff \| raw
2017-08-22	Merge branch 'ab/ref-filter-no-contains'	blob \| diff \| raw
2017-08-22	Merge branch 'bw/push-options-recursively-to-submodules'	blob \| diff \| raw
2017-08-11	Merge branch 'dl/credential-cache-socket-in-xdg-cache'	blob \| diff \| raw
2017-08-11	Merge branch 'dc/fmt-merge-msg-microcleanup'	blob \| diff \| raw
2017-08-11	Merge branch 'ah/doc-wserrorhighlight'	blob \| diff \| raw
2017-08-11	Merge branch 'cc/ref-is-hidden-microcleanup'	blob \| diff \| raw
2017-08-11	Merge branch 'js/run-process-parallel-api-fix'	blob \| diff \| raw
2017-08-11	Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths'	blob \| diff \| raw
2017-08-11	Merge branch 'rs/stat-data-unaligned-reads-fix'	blob \| diff \| raw
2017-08-11	Merge branch 'rs/bswap-ubsan-fix'	blob \| diff \| raw
2017-08-04	Merge branch 'ah/patch-id-doc'	blob \| diff \| raw
2017-08-01	Merge tag 'v2.12.4' into maint	blob \| diff \| raw
2017-07-31	Merge branch 'jn/hooks-pre-rebase-sample-fix' into...	blob \| diff \| raw
2017-07-31	Merge branch 'rs/apply-avoid-over-reading' into maint	blob \| diff \| raw
2017-07-30	Merge tag 'v2.11.3' into maint-2.12	blob \| diff \| raw \| diff to current
2017-07-30	Merge tag 'v2.10.4' into maint-2.11	blob \| diff \| raw \| diff to current
2017-07-25	Merge branch 'js/msgfmt-on-windows' of ../git-gui into...	blob \| diff \| raw
2017-07-21	Merge branch 'ew/fd-cloexec-fix' into maint	blob \| diff \| raw
2017-07-21	Merge branch 'ks/fix-rebase-doc-picture' into maint	blob \| diff \| raw
2017-07-21	Merge branch 'bb/unicode-10.0' into maint	blob \| diff \| raw
2017-07-20	Merge branch 'ew/fd-cloexec-fix'	blob \| diff \| raw
2017-07-18	Merge branch 'jn/hooks-pre-rebase-sample-fix'	blob \| diff \| raw
2017-07-12	Merge branch 'kn/ref-filter-branch-list' into maint	blob \| diff \| raw
2017-07-12	Merge branch 'ks/fix-rebase-doc-picture'	blob \| diff \| raw
2017-07-12	Merge branch 'kn/ref-filter-branch-list'	blob \| diff \| raw
2017-07-12	Merge branch 'rs/apply-avoid-over-reading'	blob \| diff \| raw
2017-07-10	Merge branch 'jc/utf8-fprintf' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'js/fsck-name-object' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'js/t5534-rev-parse-gives-multi-line-outpu...	blob \| diff \| raw
2017-07-10	Merge branch 'aw/contrib-subtree-doc-asciidoctor' into...	blob \| diff \| raw
2017-07-10	Merge branch 'ah/doc-pretty-color-auto-prefix' into...	blob \| diff \| raw
2017-07-10	Merge branch 'mb/reword-autocomplete-message' into...	blob \| diff \| raw
2017-07-10	Merge branch 'ks/t7508-indent-fix' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'sb/t4005-modernize' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'rs/apply-validate-input' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'jc/pack-bitmap-unaligned' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'pw/rebase-i-regression-fix-tests' into...	blob \| diff \| raw
2017-07-10	Merge branch 'jk/add-p-commentchar-fix' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'rs/pretty-add-again' into maint	blob \| diff \| raw
2017-07-10	Merge branch 'bb/unicode-10.0'	blob \| diff \| raw
2017-07-07	Merge branch 'js/t5534-rev-parse-gives-multi-line-outpu...	blob \| diff \| raw
2017-07-07	Merge branch 'rs/apply-avoid-over-reading'	blob \| diff \| raw
2017-07-07	Merge branch 'jc/utf8-fprintf'	blob \| diff \| raw
2017-07-07	Merge branch 'js/fsck-name-object'	blob \| diff \| raw
2017-07-07	Merge branch 'aw/contrib-subtree-doc-asciidoctor'	blob \| diff \| raw
2017-06-30	Merge branch 'rs/apply-validate-input'	blob \| diff \| raw
2017-06-30	Merge branch 'jc/pack-bitmap-unaligned'	blob \| diff \| raw
2017-06-30	Merge branch 'ah/doc-pretty-color-auto-prefix'	blob \| diff \| raw
2017-06-30	Merge branch 'pw/rebase-i-regression-fix-tests'	blob \| diff \| raw
2017-06-26	Merge branch 'mb/reword-autocomplete-message'	blob \| diff \| raw
2017-06-26	Merge branch 'ks/t7508-indent-fix'	blob \| diff \| raw
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
next