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

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

projects / thirdparty / git.git / history

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

2008-10-09	Shawn O. Pearce	Merge branch 'lt/time-reject-fractional-seconds'	blob \| commitdiff \| raw
2008-10-09	Shawn O. Pearce	Merge branch 'jc/add-ita'	blob \| commitdiff \| raw
2008-10-09	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2008-10-08	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2008-10-06	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2008-10-03	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2008-10-01	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2008-09-30	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2008-09-29	Shawn O. Pearce	Merge branch 'bc/master-diff-hunk-header-fix'	blob \| commitdiff \| raw
2008-09-29	Shawn O. Pearce	Merge branch 'maint' into bc/master-diff-hunk-header-fix	blob \| commitdiff \| raw \| diff to current
2008-09-29	Shawn O. Pearce	Merge branch 'bc/maint-diff-hunk-header-fix' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-29	Shawn O. Pearce	Merge branch 'jc/better-conflict-resolution'	blob \| commitdiff \| raw
2008-09-29	Shawn O. Pearce	Merge branch 'mg/maint-remote-fix' into maint	blob \| commitdiff \| raw \| diff to current
2008-09-29	Alex Riesen	Use remove_path from dir.c instead of own implementation	blob \| commitdiff \| raw \| diff to current
2008-09-26	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw
2008-09-26	Alex Riesen	Remove empty directories in recursive merge	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'mv/merge-recursive'	blob \| commitdiff \| raw
2008-09-25	Shawn O. Pearce	Merge branch 'jc/safe-c-l-d'	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-09-25	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-23	Junio C Hamano	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| commitdiff \| raw \| diff to current
2008-09-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-22	Junio C Hamano	Merge branch 'db/maint-checkout-b'	blob \| commitdiff \| raw \| diff to current
2008-09-21	Junio C Hamano	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| commitdiff \| raw \| diff to current
2008-09-20	Junio C Hamano	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| commitdiff \| raw \| diff to current
2008-09-20	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'bc/maint-diff-hunk-header-fix' into bc...	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'jc/diff-prefix'	blob \| commitdiff \| raw \| diff to current
2008-09-19	Junio C Hamano	Merge branch 'tr/rev-list-reverse'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'dp/maint-rebase-fix'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-checkout-keep-remove'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-diff-quiet'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-name-hash-clear'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'jc/maint-template-permbits'	blob \| commitdiff \| raw \| diff to current
2008-09-16	Junio C Hamano	Merge branch 'mh/maint-honor-no-ssl-verify'	blob \| commitdiff \| raw \| diff to current
2008-09-13	Junio C Hamano	Sync with 1.6.0.2	blob \| commitdiff \| raw \| diff to current
2008-09-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-10	Junio C Hamano	Merge branch 'ho/dashless'	blob \| commitdiff \| raw \| diff to current
2008-09-08	Junio C Hamano	Merge branch 'jc/cc-ld-dynpath'	blob \| commitdiff \| raw \| diff to current
2008-09-08	Junio C Hamano	Merge branch 'jc/hide-cr-in-diff-from-less'	blob \| commitdiff \| raw \| diff to current
2008-09-08	Junio C Hamano	Merge branch 'jc/maint-checkout-fix'	blob \| commitdiff \| raw \| diff to current
2008-09-07	Junio C Hamano	Merge updated git-gui and gitk that call each other	blob \| commitdiff \| raw \| diff to current
2008-09-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2008-09-05	Junio C Hamano	Merge branch 'jc/maint-log-grep'	blob \| commitdiff \| raw \| diff to current
2008-09-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-03	Junio C Hamano	Merge branch 'tr/filter-branch'	blob \| commitdiff \| raw \| diff to current
2008-09-03	Junio C Hamano	Merge branch 'np/maint-safer-pack'	blob \| commitdiff \| raw \| diff to current
2008-09-03	Junio C Hamano	Merge branch 'jc/author-nickname'	blob \| commitdiff \| raw \| diff to current
2008-09-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-09-03	Junio C Hamano	Merge branch 'np/maint-safer-pack' into np/pack	blob \| commitdiff \| raw \| diff to current
2008-08-31	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-31	Miklos Vajna	merge-recursive: introduce merge_options	blob \| commitdiff \| raw
2008-08-31	Stephan Beyer	merge-recursive.c: Add more generic merge_recursive_gen...	blob \| commitdiff \| raw \| diff to current
2008-08-31	Miklos Vajna	Split out merge_recursive() to merge-recursive.c	blob \| commitdiff \| raw \| diff to current
2008-08-31	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-31	Junio C Hamano	Merge branch 'jc/maint-checkout-fix' into 'jc/better...	blob \| commitdiff \| raw \| diff to current
2008-08-31	Junio C Hamano	git-merge-recursive: learn to honor merge.conflictstyle	blob \| commitdiff \| raw \| diff to current
2008-08-30	Junio C Hamano	Merge branch 'sb/daemon'	blob \| commitdiff \| raw \| diff to current
2008-08-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-28	Junio C Hamano	Merge branch 'mv/merge-custom'	blob \| commitdiff \| raw \| diff to current
2008-08-28	Junio C Hamano	Merge branch 'ml/submodule'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'am/cherry-pick-rerere'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'jc/add-addremove'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'np/verify-pack'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'af/maint-install-no-handlink'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'jc/no-slim-shell'	blob \| commitdiff \| raw \| diff to current
2008-08-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-24	Junio C Hamano	Merge branch 'jc/no-slim-shell'	blob \| commitdiff \| raw \| diff to current
2008-08-24	Junio C Hamano	Merge branch 'maint' to sync with 1.6.0.1	blob \| commitdiff \| raw \| diff to current
2008-08-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-22	Jonathan del Strother	Revert "Convert output messages in merge-recursive...	blob \| commitdiff \| raw \| diff to current
2008-08-20	Junio C Hamano	Merge branch 'ph/enable-threaded'	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git-gui 0.11.0	blob \| commitdiff \| raw \| diff to current
2008-08-17	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-08-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-07	Junio C Hamano	Merge branch 'lt/config-fsync' into maint	blob \| commitdiff \| raw \| diff to current
2008-08-07	Junio C Hamano	Merge branch 'jc/reflog-expire' into maint	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Sync with 1.5.6.5	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-08-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-08-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-07-30	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-27	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-07-24	Junio C Hamano	Merge branch 'maint' into ph/checkout	blob \| commitdiff \| raw \| diff to current
2008-07-22	Johannes Schindelin	Rename path_list to string_list	blob \| commitdiff \| raw \| diff to current
2008-07-21	Junio C Hamano	Merge branch 'ap/trackinfo' v1.6.0-rc0	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom