git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge-index.c

projects / thirdparty / git.git / history

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

2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'jt/fast-export-copy-modify-fix' into...	blob \| commitdiff \| raw
2017-10-23	Junio C Hamano	Merge branch 'nd/worktree-kill-parse-ref' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/qsort-s' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/doc-read-tree-table-asciidoctor-fix...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/system-path-cleanup' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ma/pkt-line-leakfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/config-lockfile-leak-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/drop-sha1-entry-pos' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rb/compat-poll-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ar/request-pull-phrasofix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jc/merge-x-theirs-docfix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/mailinfo-qp-decode-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'ik/userdiff-html-h-element-fix' into...	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'jk/describe-omit-some-refs' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'aw/gc-lockfile-fscanf-fix' into maint	blob \| commitdiff \| raw
2017-10-18	Junio C Hamano	Merge branch 'rs/strbuf-getwholeline-fix' into maint	blob \| commitdiff \| raw
2017-09-22	Junio C Hamano	Sync with 2.12.5	blob \| commitdiff \| raw
2017-09-22	Junio C Hamano	Sync with 2.11.4	blob \| commitdiff \| raw \| diff to current
2017-09-22	Junio C Hamano	Sync with 2.10.5	blob \| commitdiff \| raw \| diff to current
2017-09-20	Junio C Hamano	Merge branch 'jk/info-alternates-fix-2.11' into jk...	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jt/doc-pack-objects-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jn/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'bc/vcs-svn-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/doc-the-this' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/submodule-parallel-update' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'hv/t5526-andand-chain-fix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'sb/sha1-file-cleanup' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t1002-do-not-use-sum' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'ah/doc-empty-string-is-false' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/find-pack-entry-bisection' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/apply-lose-prefix-length' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rj/add-chmod-error-message' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jk/hashcmp-memcmp' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t3700-clean-leftover' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'jc/perl-git-comment-typofix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'ab/ref-filter-no-contains' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'as/grep-quiet-no-match-exit-code-fix...	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/unpack-entry-leakfix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/fsck-obj-leakfix' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/t4062-obsd' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'rs/obsd-getcwd-workaround' into maint	blob \| commitdiff \| raw
2017-09-10	Junio C Hamano	Merge branch 'bw/push-options-recursively-to-submodules...	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'dc/fmt-merge-msg-microcleanup' into maint	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'ah/doc-wserrorhighlight' into maint	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'cc/ref-is-hidden-microcleanup' into maint	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'js/run-process-parallel-api-fix' into...	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'rs/stat-data-unaligned-reads-fix' into...	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'rs/bswap-ubsan-fix' into maint	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'dl/credential-cache-socket-in-xdg-cache...	blob \| commitdiff \| raw
2017-08-23	Junio C Hamano	Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths...	blob \| commitdiff \| raw
2017-08-04	Junio C Hamano	Merge branch 'ah/patch-id-doc'	blob \| commitdiff \| raw
2017-08-01	Junio C Hamano	Merge tag 'v2.12.4' into maint	blob \| commitdiff \| raw
2017-07-31	Junio C Hamano	Merge branch 'jn/hooks-pre-rebase-sample-fix' into...	blob \| commitdiff \| raw
2017-07-31	Junio C Hamano	Merge branch 'rs/apply-avoid-over-reading' into maint	blob \| commitdiff \| raw
2017-07-30	Junio C Hamano	Merge tag 'v2.11.3' into maint-2.12	blob \| commitdiff \| raw \| diff to current
2017-07-30	Junio C Hamano	Merge tag 'v2.10.4' into maint-2.11	blob \| commitdiff \| raw \| diff to current
2017-07-25	Junio C Hamano	Merge branch 'js/msgfmt-on-windows' of ../git-gui into...	blob \| commitdiff \| raw
2017-07-21	Junio C Hamano	Merge branch 'ew/fd-cloexec-fix' into maint	blob \| commitdiff \| raw
2017-07-21	Junio C Hamano	Merge branch 'ks/fix-rebase-doc-picture' into maint	blob \| commitdiff \| raw
2017-07-21	Junio C Hamano	Merge branch 'bb/unicode-10.0' into maint	blob \| commitdiff \| raw
2017-07-20	Junio C Hamano	Merge branch 'ew/fd-cloexec-fix'	blob \| commitdiff \| raw
2017-07-18	Junio C Hamano	Merge branch 'jn/hooks-pre-rebase-sample-fix'	blob \| commitdiff \| raw
2017-07-12	Junio C Hamano	Merge branch 'kn/ref-filter-branch-list' into maint	blob \| commitdiff \| raw
2017-07-12	Junio C Hamano	Merge branch 'ks/fix-rebase-doc-picture'	blob \| commitdiff \| raw
2017-07-12	Junio C Hamano	Merge branch 'kn/ref-filter-branch-list'	blob \| commitdiff \| raw
2017-07-12	Junio C Hamano	Merge branch 'rs/apply-avoid-over-reading'	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'jc/utf8-fprintf' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'js/fsck-name-object' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'js/t5534-rev-parse-gives-multi-line-outpu...	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'aw/contrib-subtree-doc-asciidoctor' into...	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'ah/doc-pretty-color-auto-prefix' into...	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'mb/reword-autocomplete-message' into...	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'ks/t7508-indent-fix' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'sb/t4005-modernize' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'rs/apply-validate-input' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'jc/pack-bitmap-unaligned' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'pw/rebase-i-regression-fix-tests' into...	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'jk/add-p-commentchar-fix' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'rs/pretty-add-again' into maint	blob \| commitdiff \| raw
2017-07-10	Junio C Hamano	Merge branch 'bb/unicode-10.0'	blob \| commitdiff \| raw
2017-07-07	Junio C Hamano	Merge branch 'js/t5534-rev-parse-gives-multi-line-outpu...	blob \| commitdiff \| raw
2017-07-07	Junio C Hamano	Merge branch 'rs/apply-avoid-over-reading'	blob \| commitdiff \| raw
2017-07-07	Junio C Hamano	Merge branch 'jc/utf8-fprintf'	blob \| commitdiff \| raw
2017-07-07	Junio C Hamano	Merge branch 'js/fsck-name-object'	blob \| commitdiff \| raw
2017-07-07	Junio C Hamano	Merge branch 'aw/contrib-subtree-doc-asciidoctor'	blob \| commitdiff \| raw
2017-06-30	Junio C Hamano	Merge branch 'rs/apply-validate-input'	blob \| commitdiff \| raw
2017-06-30	Junio C Hamano	Merge branch 'jc/pack-bitmap-unaligned'	blob \| commitdiff \| raw
2017-06-30	Junio C Hamano	Merge branch 'ah/doc-pretty-color-auto-prefix'	blob \| commitdiff \| raw
2017-06-30	Junio C Hamano	Merge branch 'pw/rebase-i-regression-fix-tests'	blob \| commitdiff \| raw
2017-06-26	Junio C Hamano	Merge branch 'mb/reword-autocomplete-message'	blob \| commitdiff \| raw
2017-06-26	Junio C Hamano	Merge branch 'ks/t7508-indent-fix'	blob \| commitdiff \| raw
2017-06-26	Junio C Hamano	Merge branch 'jk/add-p-commentchar-fix'	blob \| commitdiff \| raw
2017-06-24	Junio C Hamano	Merge branch 'sg/doc-pretty-formats' into maint	blob \| commitdiff \| raw
2017-06-24	Junio C Hamano	Merge branch 'sg/revision-parser-skip-prefix' into...	blob \| commitdiff \| raw
2017-06-24	Junio C Hamano	Merge branch 'km/test-mailinfo-b-failure' into maint	blob \| commitdiff \| raw
2017-06-24	Junio C Hamano	Merge branch 'sb/submodule-rm-absorb' into maint	blob \| commitdiff \| raw
2017-06-24	Junio C Hamano	Merge branch 'jc/diff-tree-stale-comment' into maint	blob \| commitdiff \| raw
2017-06-24	Junio C Hamano	Merge branch 'ps/stash-push-pathspec-fix' into maint	blob \| commitdiff \| raw
2017-06-24	Junio C Hamano	Merge branch 'jk/pack-idx-corruption-safety' into maint	blob \| commitdiff \| raw
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom