git.oblomov.eu Git - git/history - builtin/merge-recursive.c

2015-12-04	Junio C Hamano	Merge branch 'ad/sha1-update-chunked'	blob \| commitdiff \| raw
2015-12-01	Jeff King	Merge branch 'mk/blame-first-parent'	blob \| commitdiff \| raw
2015-12-01	Jeff King	Merge branch 'maint'	blob \| commitdiff \| raw
2015-11-25	Jeff King	Merge branch 'fp/subtree-todo-update'	blob \| commitdiff \| raw
2015-11-25	Jeff King	Merge branch 'rc/configure-use-libs-when-checking-a...	blob \| commitdiff \| raw
2015-11-25	Jeff King	Merge branch 'maint'	blob \| commitdiff \| raw
2015-11-20	Jeff King	Merge branch 'dk/gc-idx-wo-pack'	blob \| commitdiff \| raw
2015-11-05	Junio C Hamano	Merge branch 'ea/checkout-progress'	blob \| commitdiff \| raw
2015-11-05	Junio C Hamano	Sync with 2.6.3	blob \| commitdiff \| raw
2015-11-05	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff \| raw \| diff to current
2015-11-04	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'rs/daemon-plug-child-leak'	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'mk/blame-first-parent'	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'rs/wt-status-detached-branch-fix'	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'rs/show-branch-argv-array'	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'jk/initialization-fix-to-add-submodule...	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'da/difftool'	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'jc/mailinfo-lib'	blob \| commitdiff \| raw
2015-11-03	Junio C Hamano	Merge branch 'kn/for-each-branch'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'jk/merge-file-exit-code'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'gr/rebase-i-drop-warn'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'xf/user-manual-ff'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'rs/pop-commit'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'mk/blame-error-message'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'js/misc-fixes'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'js/imap-send-curl-compilation-fix'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'jk/delete-modechange-conflict'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge branch 'jc/add-u-A-default-to-top'	blob \| commitdiff \| raw
2015-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'jc/am-mailinfo-direct'	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'jc/mailinfo-lib'	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'rp/link-curl-before-ssl'	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'dt/name-hash-dir-entry-fix'	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'tk/sigchain-unnecessary-post-tempfile'	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'jc/em-dash-in-doc'	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'jc/everyday-markup'	blob \| commitdiff \| raw
2015-10-29	Junio C Hamano	Merge branch 'xf/user-manual-markup'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'dk/p4-import-ctypes'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'jk/repository-extension'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'dt/t7063-fix-flaky-test'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'kn/for-each-tag'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'es/worktree-add'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'tk/stripspace'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'rt/placeholder-in-usage'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'jc/usage-stdin'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'mr/worktree-list'	blob \| commitdiff \| raw
2015-10-26	Junio C Hamano	Merge branch 'jc/am-3-fallback-regression-fix'	blob \| commitdiff \| raw
2015-10-20	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2015-10-20	Junio C Hamano	Merge branch 'tb/t0027-crlf'	blob \| commitdiff \| raw
2015-10-20	Junio C Hamano	Merge branch 'ls/p4-test-updates'	blob \| commitdiff \| raw
2015-10-20	Junio C Hamano	Merge branch 'jk/war-on-sprintf'	blob \| commitdiff \| raw
2015-10-16	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-10-05	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| commitdiff \| raw \| diff to current
2015-09-25	Jeff King	convert trivial sprintf / strcpy calls to xsnprintf	blob \| commitdiff \| raw
2015-09-17	Junio C Hamano	Merge branch 'as/config-doc-markup-fix'	blob \| commitdiff \| raw \| diff to current
2015-09-17	Junio C Hamano	Merge branch 'br/svn-doc-include-paths-config' into...	blob \| commitdiff \| raw \| diff to current
2015-09-17	Junio C Hamano	Merge branch 'ah/submodule-typofix-in-error' into maint	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge branch 'mp/t7060-diff-index-test'	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge branch 'gb/apply-comment-typofix'	blob \| commitdiff \| raw \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'ee/clean-test-fixes' into maint	blob \| commitdiff \| raw \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'sg/t3020-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-09-02	Junio C Hamano	Merge branch 'ee/clean-test-fixes'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/submodule-typofix-in-error'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/reflog-typofix-in-error'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/read-tree-usage-string'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'ah/pack-objects-usage-strings'	blob \| commitdiff \| raw \| diff to current
2015-09-01	Junio C Hamano	Merge branch 'br/svn-doc-include-paths-config'	blob \| commitdiff \| raw \| diff to current
2015-08-26	Junio C Hamano	Merge branch 'sg/t3020-typofix'	blob \| commitdiff \| raw \| diff to current
2015-07-15	Junio C Hamano	Merge branch 'jc/prompt-document-ps1-state-separator...	blob \| commitdiff \| raw \| diff to current
2015-07-15	Junio C Hamano	Merge branch 'fk/doc-format-patch-vn' into maint	blob \| commitdiff \| raw \| diff to current
2015-07-01	Junio C Hamano	Merge branch 'jc/prompt-document-ps1-state-separator'	blob \| commitdiff \| raw \| diff to current
2015-06-24	Junio C Hamano	Merge branch 'fk/doc-format-patch-vn'	blob \| commitdiff \| raw \| diff to current
2015-06-16	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-06-05	Junio C Hamano	Merge branch 'jc/gitignore-precedence' into maint	blob \| commitdiff \| raw \| diff to current
2015-06-01	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix'	blob \| commitdiff \| raw \| diff to current
2015-05-26	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long' into...	blob \| commitdiff \| raw \| diff to current
2015-05-19	Junio C Hamano	Merge branch 'jc/gitignore-precedence'	blob \| commitdiff \| raw \| diff to current
2015-05-13	Junio C Hamano	Merge branch 'ep/fix-test-lib-functions-report' into...	blob \| commitdiff \| raw \| diff to current
2015-05-11	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long'	blob \| commitdiff \| raw \| diff to current
2015-05-06	Junio C Hamano	Merge branch 'ep/fix-test-lib-functions-report'	blob \| commitdiff \| raw \| diff to current
2015-04-28	Junio C Hamano	Merge branch 'mg/show-notes-doc'	blob \| commitdiff \| raw \| diff to current
2015-04-21	Junio C Hamano	Merge branch 'jz/gitweb-conf-doc-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-04-19	Junio C Hamano	Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw \| diff to current
2015-04-14	Junio C Hamano	Merge branch 'sb/plug-streaming-leak'	blob \| commitdiff \| raw \| diff to current
2015-04-14	Junio C Hamano	Merge branch 'jz/gitweb-conf-doc-fix'	blob \| commitdiff \| raw \| diff to current
2015-03-24	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-03-23	Junio C Hamano	Merge branch 'jc/decorate-leaky-separator-color' into...	blob \| commitdiff \| raw \| diff to current
2015-03-20	Junio C Hamano	Merge branch 'jc/decorate-leaky-separator-color'	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'jc/diff-test-updates' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-14	Junio C Hamano	Merge branch 'jc/apply-beyond-symlink' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-10	Junio C Hamano	Merge branch 'jc/decorate-leaky-separator-color' into...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'es/blame-commit-info-fix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'ab/merge-file-prefix' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'ps/submodule-sanitize-path-upon-add'...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jk/pack-bitmap' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jk/decimal-width-for-uintmax' into maint	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'jc/diff-test-updates'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom