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

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

projects / thirdparty / git.git / history

[thirdparty/git.git] / merge-recursive.c

2009-09-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw
2009-09-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-09-16	Junio C Hamano	Merge 1.6.4.4 in	blob \| commitdiff \| raw
2009-09-16	Junio C Hamano	Merge branch 'jc/maint-unpack-objects-strict' into...	blob \| commitdiff \| raw \| diff to current
2009-09-16	Junio C Hamano	Merge branch 'tf/diff-whitespace-incomplete-line' into...	blob \| commitdiff \| raw \| diff to current
2009-09-16	Junio C Hamano	Merge branch 'jk/maint-1.6.3-checkout-unborn' into...	blob \| commitdiff \| raw \| diff to current
2009-09-16	Junio C Hamano	Merge branch 'jc/maint-checkout-index-to-prefix' into...	blob \| commitdiff \| raw \| diff to current
2009-09-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2009-09-13	Junio C Hamano	Merge branch 'pk/fast-import-tars'	blob \| commitdiff \| raw
2009-09-13	Junio C Hamano	Merge branch 'pk/fast-import-dirs'	blob \| commitdiff \| raw
2009-09-13	Junio C Hamano	Merge branch 'jt/pushinsteadof'	blob \| commitdiff \| raw
2009-09-13	Junio C Hamano	Merge branch 'jk/unwanted-advices'	blob \| commitdiff \| raw
2009-09-13	Junio C Hamano	Merge branch 'jc/merge-saner-messages'	blob \| commitdiff \| raw
2009-09-13	Junio C Hamano	Merge branch 'db/vcs-helper'	blob \| commitdiff \| raw \| diff to current
2009-09-13	Junio C Hamano	Merge branch 'cb/maint-1.6.3-grep-relative-up' into...	blob \| commitdiff \| raw \| diff to current
2009-09-08	Junio C Hamano	merge-recursive: give less scary messages when merge...	blob \| commitdiff \| raw
2009-09-07	Junio C Hamano	Merge branch 'tr/reset-checkout-patch'	blob \| commitdiff \| raw \| diff to current
2009-09-07	Junio C Hamano	Merge branch 'np/maint-1.6.3-deepen'	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-09-03	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-09-01	Junio C Hamano	Merge branch 'mr/gitweb-snapshot'	blob \| commitdiff \| raw \| diff to current
2009-09-01	Junio C Hamano	Merge branch 'tf/diff-whitespace-incomplete-line'	blob \| commitdiff \| raw \| diff to current
2009-08-29	Junio C Hamano	Merge branch 'jk/maint-1.6.3-checkout-unborn'	blob \| commitdiff \| raw \| diff to current
2009-08-29	Junio C Hamano	Merge branch 'np/maint-1.6.3-deepen'	blob \| commitdiff \| raw \| diff to current
2009-08-29	Junio C Hamano	Merge branch 'jc/shortstatus'	blob \| commitdiff \| raw \| diff to current
2009-08-29	Junio C Hamano	Merge branch 'rc/maint-http-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-08-28	Junio C Hamano	Merge branch 'lt/block-sha1'	blob \| commitdiff \| raw \| diff to current
2009-08-27	Junio C Hamano	Merge branch 'as/maint-graph-interesting-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-27	Junio C Hamano	Merge branch 'jc/maint-unpack-objects-strict'	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'js/maint-cover-letter-non-ascii' into...	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'jc/maint-clean-nested-dir-safety' into...	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'jk/maint-merge-msg-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'jc/apply-epoch-patch' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'jp/symlink-dirs' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-26	Junio C Hamano	Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...	blob \| commitdiff \| raw \| diff to current
2009-08-25	Junio C Hamano	Merge branch 'aj/fix-read-tree-from-scratch'	blob \| commitdiff \| raw \| diff to current
2009-08-25	Junio C Hamano	Merge branch 'jc/maint-checkout-index-to-prefix'	blob \| commitdiff \| raw \| diff to current
2009-08-24	Junio C Hamano	Merge branch 'jc/verify-pack-stat'	blob \| commitdiff \| raw \| diff to current
2009-08-24	Junio C Hamano	Merge branch 'mr/gitweb-xz'	blob \| commitdiff \| raw \| diff to current
2009-08-24	Junio C Hamano	Merge branch 'ld/p4'	blob \| commitdiff \| raw \| diff to current
2009-08-22	Junio C Hamano	Merge branch 'bc/maint-am-email' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-22	Junio C Hamano	Merge branch 'cc/replace'	blob \| commitdiff \| raw \| diff to current
2009-08-22	Junio C Hamano	Merge branch 'gb/apply-ignore-whitespace'	blob \| commitdiff \| raw \| diff to current
2009-08-22	Junio C Hamano	Merge branch 'bc/mailsplit-cr-at-eol'	blob \| commitdiff \| raw \| diff to current
2009-08-21	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-19	Junio C Hamano	Merge branch 'rc/maint-http-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-19	Junio C Hamano	Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge branch 'lt/block-sha1'	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge branch 'bc/maint-am-email'	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge branch 'js/maint-cover-letter-non-ascii'	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge branch 'jc/maint-clean-nested-dir-safety'	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge branch 'jk/maint-merge-msg-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-16	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2009-08-14	Junio C Hamano	Merge branch 'jn/gitweb-blame' (early part)	blob \| commitdiff \| raw \| diff to current
2009-08-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-08-12	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'jk/push-quiet'	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'jc/maint-merge-recursive-fix'	blob \| commitdiff \| raw \| diff to current
2009-08-11	Junio C Hamano	Merge branch 'js/run-command-updates'	blob \| commitdiff \| raw \| diff to current
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.2' into maint-1.6.3	blob \| commitdiff \| raw \| diff to current
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.1' into maint-1.6.2	blob \| commitdiff \| raw \| diff to current
2009-08-08	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw \| diff to current
2009-08-05	Junio C Hamano	Merge branch 'sb/read-tree'	blob \| commitdiff \| raw \| diff to current
2009-08-05	Junio C Hamano	Merge branch 'ne/futz-upload-pack'	blob \| commitdiff \| raw \| diff to current
2009-08-05	Junio C Hamano	Merge branch 'maint-1.6.3' into maint	blob \| commitdiff \| raw \| diff to current
2009-07-31	Junio C Hamano	merge-recursive: don't segfault while handling rename...	blob \| commitdiff \| raw \| diff to current
2009-07-29	Junio C Hamano	Merge branch 'hv/cvsps-tests'	blob \| commitdiff \| raw \| diff to current
2009-07-29	Junio C Hamano	Sync with 1.6.3.4	blob \| commitdiff \| raw \| diff to current
2009-07-26	Junio C Hamano	Merge branch 'gp/maint-rebase-p-onto'	blob \| commitdiff \| raw \| diff to current
2009-07-26	Junio C Hamano	Merge branch 'en/fast-export'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'js/maint-graft-unhide-true-parents'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'av/maint-config-reader'	blob \| commitdiff \| raw \| diff to current
2009-07-25	Junio C Hamano	Merge branch 'jk/maint-send-email-alias-loop'	blob \| commitdiff \| raw \| diff to current
2009-07-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-11	Junio C Hamano	Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'	blob \| commitdiff \| raw \| diff to current
2009-07-09	Junio C Hamano	Merge branch 'ld/push-porcelain-output-format'	blob \| commitdiff \| raw \| diff to current
2009-07-09	Junio C Hamano	Merge branch 'gb/gitweb-avatar'	blob \| commitdiff \| raw \| diff to current
2009-07-09	Junio C Hamano	Merge branch 'ml/http'	blob \| commitdiff \| raw \| diff to current
2009-07-09	Junio C Hamano	Merge branch 'rs/grep-p'	blob \| commitdiff \| raw \| diff to current
2009-07-09	Junio C Hamano	Merge branch 'js/run-command-updates' (early part)	blob \| commitdiff \| raw \| diff to current
2009-07-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2009-07-06	Junio C Hamano	Merge branch 'tr/die_errno'	blob \| commitdiff \| raw \| diff to current
2009-07-06	Junio C Hamano	Merge branch 'cb/maint-fetch-refspec-wo-dst'	blob \| commitdiff \| raw \| diff to current
2009-07-06	Junio C Hamano	Merge branch 'sb/show-ref-parse-options'	blob \| commitdiff \| raw \| diff to current
2009-07-06	Junio C Hamano	Merge branch 'gb/am-foreign'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom