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-08-31	Miklos Vajna	Split out merge_recursive() to merge-recursive.c	blob \| commitdiff \| raw
2008-08-31	Junio C Hamano	Merge branch 'maint'	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
2008-07-21	Junio C Hamano	Merge branch 'jc/rerere-auto-more'	blob \| commitdiff \| raw \| diff to current
2008-07-21	Junio C Hamano	Merge branch 'ns/am-abort'	blob \| commitdiff \| raw \| diff to current
2008-07-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-07-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'mv/dashless'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'ls/mailinfo'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'sb/dashless'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'rs/archive'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'ag/blame'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'rs/rebase-checkout-not-so-quiet'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'sp/maint-index-pack'	blob \| commitdiff \| raw \| diff to current
2008-07-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-07-16	Junio C Hamano	Merge branch 'mv/merge-in-c'	blob \| commitdiff \| raw \| diff to current
2008-07-15	René Scharfe	add context pointer to read_tree_recursive()	blob \| commitdiff \| raw \| diff to current
2008-07-15	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-15	Junio C Hamano	Merge branch 'jc/branch-merged'	blob \| commitdiff \| raw \| diff to current
2008-07-13	Junio C Hamano	Merge branch 'ph/parseopt-step-blame'	blob \| commitdiff \| raw \| diff to current
2008-07-09	Junio C Hamano	Merge branch 'jc/reflog-expire'	blob \| commitdiff \| raw \| diff to current
2008-07-08	Junio C Hamano	Merge branch 'jc/blame' (early part) into HEAD	blob \| commitdiff \| raw \| diff to current
2008-07-08	Junio C Hamano	Merge branch 'lt/racy-empty' into maint	blob \| commitdiff \| raw \| diff to current
2008-07-07	Junio C Hamano	Merge branch 'jc/rerere'	blob \| commitdiff \| raw \| diff to current
2008-07-07	Junio C Hamano	Merge branch 'dr/ceiling'	blob \| commitdiff \| raw \| diff to current
2008-07-06	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-07-03	Junio C Hamano	Merge branch 'j6t/mingw'	blob \| commitdiff \| raw \| diff to current
2008-07-03	Junio C Hamano	Merge branch 'jc/maint-reset' into maint	blob \| commitdiff \| raw \| diff to current
2008-07-01	Junio C Hamano	Merge branch 'ph/mergetool'	blob \| commitdiff \| raw \| diff to current
2008-07-01	Junio C Hamano	Merge branch 'jc/maint-reset'	blob \| commitdiff \| raw \| diff to current
2008-07-01	Junio C Hamano	Merge branch 'jc/dashless' (early part)	blob \| commitdiff \| raw \| diff to current
2008-07-01	Junio C Hamano	Merge branch 'nd/dashless'	blob \| commitdiff \| raw \| diff to current
2008-07-01	Miklos Vajna	Move commit_list_count() to commit.c	blob \| commitdiff \| raw \| diff to current
2008-06-27	Junio C Hamano	Merge branch 'maint-1.5.5' into maint	blob \| commitdiff \| raw \| diff to current
2008-06-27	Junio C Hamano	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'sb/rebase'	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'lw/gitweb'	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'lt/config-fsync'	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'sr/tests'	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'jh/clone-packed-refs'	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'lw/perlish'	blob \| commitdiff \| raw \| diff to current
2008-06-25	Jeff King	clone: create intermediate directories of destination...	blob \| commitdiff \| raw \| diff to current
2008-06-25	Junio C Hamano	Merge branch 'jc/maint-combine-diff-pre-context' into...	blob \| commitdiff \| raw \| diff to current
2008-06-25	Jeff King	clone: create intermediate directories of destination...	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'rs/archive-ignore'	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'lt/racy-empty'	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'jc/maint-combine-diff-pre-context'	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'mo/status-untracked'	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'kh/update-ref'	blob \| commitdiff \| raw \| diff to current
2008-06-22	Junio C Hamano	Merge branch 'rg/gitweb'	blob \| commitdiff \| raw \| diff to current
2008-06-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-14	Junio C Hamano	Merge branch 'rs/attr'	blob \| commitdiff \| raw \| diff to current
2008-06-11	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-06-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-09	Junio C Hamano	Merge branch 'js/merge-recursive'	blob \| commitdiff \| raw \| diff to current
2008-06-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-09	Johannes Schindelin	merge-recursive: respect core.autocrlf when writing...	blob \| commitdiff \| raw \| diff to current
2008-06-07	Junio C Hamano	Merge 1.5.5.4 in	blob \| commitdiff \| raw \| diff to current
2008-06-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-06-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-05-28	Junio C Hamano	Merge 1.5.5.3 in	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom