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

2008-03-06	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw
2008-03-01	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw
2008-02-23	Junio C Hamano	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw
2008-02-11	Junio C Hamano	merge-recursive.c: guard config parser from value=NULL	blob \| commitdiff \| raw
2008-01-24	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-01-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-01-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-01-21	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-01-16	Brandon Casey	Improve use of lockfile API	blob \| commitdiff \| raw \| diff to current
2008-01-11	Junio C Hamano	Merge ../gitk	blob \| commitdiff \| raw \| diff to current
2008-01-09	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2008-01-08	Junio C Hamano	Merge in GIT 1.5.3.8	blob \| commitdiff \| raw \| diff to current
2008-01-05	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-01-03	Jim Meyering	Fix grammar nits in documentation and in code comments.	blob \| commitdiff \| raw \| diff to current
2007-12-31	Junio C Hamano	Merge branch 'maint' of git://linux-nfs.org/~bfields/git	blob \| commitdiff \| raw \| diff to current
2007-12-20	Finn Arne Gangstad	Improved submodule merge support	blob \| commitdiff \| raw \| diff to current
2007-12-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-13	Junio C Hamano	Merge branch 'cc/help'	blob \| commitdiff \| raw \| diff to current
2007-12-13	Junio C Hamano	Merge branch 'jc/shortlog-e'	blob \| commitdiff \| raw \| diff to current
2007-12-13	Junio C Hamano	Merge branch 'ew/svn-rev-db'	blob \| commitdiff \| raw \| diff to current
2007-12-13	Junio C Hamano	Merge branch 'jc/merge-recursive-gitlink'	blob \| commitdiff \| raw \| diff to current
2007-12-11	Junio C Hamano	Support a merge with conflicting gitlink change	blob \| commitdiff \| raw \| diff to current
2007-12-09	Junio C Hamano	Merge branch 'jc/spht'	blob \| commitdiff \| raw \| diff to current
2007-12-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-07	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-12-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-12-02	Junio C Hamano	Merge branch 'tt/help'	blob \| commitdiff \| raw \| diff to current
2007-12-01	Junio C Hamano	Merge 1.5.3.7 in	blob \| commitdiff \| raw \| diff to current
2007-12-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'jk/send-pack'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'js/mingw-fallouts'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'mh/rebase-skip-hard'	blob \| commitdiff \| raw \| diff to current
2007-11-25	Junio C Hamano	Merge branch 'cc/bisect'	blob \| commitdiff \| raw \| diff to current
2007-11-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-23	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-21	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2007-11-21	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'lt/rev-list-gitlink'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'ds/checkout-upper'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'sh/p4'	blob \| commitdiff \| raw \| diff to current
2007-11-19	Junio C Hamano	Merge branch 'lt/rev-list-interactive'	blob \| commitdiff \| raw \| diff to current
2007-11-18	Junio C Hamano	Merge branch 'ph/diffopts'	blob \| commitdiff \| raw \| diff to current
2007-11-18	Junio C Hamano	Merge branch 'maint' to synchronize with 1.5.3.6	blob \| commitdiff \| raw \| diff to current
2007-11-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'bs/maint-commit-options'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'rv/maint-index-commit'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'bs/maint-t7005'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'jc/maint-add-sync-stat'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'jc/stash-create'	blob \| commitdiff \| raw \| diff to current
2007-11-14	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-12	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-12	Junio C Hamano	Merge branch 'sp/maint-plug-traverse-commit-list-leak...	blob \| commitdiff \| raw \| diff to current
2007-11-12	Pierre Habouzit	Make the diff_options bitfields be an unsigned with...	blob \| commitdiff \| raw \| diff to current
2007-11-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-09	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-08	Junio C Hamano	Merge branch 'jc/clean-config'	blob \| commitdiff \| raw \| diff to current
2007-11-08	Junio C Hamano	Merge branch 'ds/maint-deflatebound'	blob \| commitdiff \| raw \| diff to current
2007-11-08	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-06	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-04	Junio C Hamano	Merge branch 'jc/revert-merge'	blob \| commitdiff \| raw \| diff to current
2007-11-04	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'np/progress'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'gp/maint-diffdoc'	blob \| commitdiff \| raw \| diff to current
2007-11-02	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'bk/maint-cvsexportcommit'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'js/forkexec'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'sp/mergetool'	blob \| commitdiff \| raw \| diff to current
2007-11-01	Junio C Hamano	Merge branch 'kh/commit'	blob \| commitdiff \| raw \| diff to current
2007-10-31	Junio C Hamano	Merge branch 'maint' to catch up with 1.5.3.5	blob \| commitdiff \| raw \| diff to current
2007-10-31	Junio C Hamano	Merge branch 'maint' into HEAD	blob \| commitdiff \| raw \| diff to current
2007-10-31	Junio C Hamano	Merge branch 'cc/skip' into HEAD	blob \| commitdiff \| raw \| diff to current
2007-10-31	Junio C Hamano	Merge branch 'jk/send-pack' into HEAD	blob \| commitdiff \| raw \| diff to current
2007-10-31	Junio C Hamano	Merge branch 'lt/rename' into HEAD	blob \| commitdiff \| raw \| diff to current
2007-10-31	Junio C Hamano	Merge branch 'ds/gitweb' into HEAD	blob \| commitdiff \| raw \| diff to current
2007-10-31	Junio C Hamano	Merge branch 'js/rebase' into HEAD	blob \| commitdiff \| raw \| diff to current
2007-10-31	Lars Hjemli	Make merge-recursive honor diff.renamelimit	blob \| commitdiff \| raw \| diff to current
2007-10-29	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-29	Junio C Hamano	merge-recursive.c: mrtree in merge() is not used before set	blob \| commitdiff \| raw \| diff to current
2007-10-28	Junio C Hamano	Merge branch 'master' of git://git.kernel.org/pub/scm...	blob \| commitdiff \| raw \| diff to current
2007-10-27	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-21	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-21	Shawn O. Pearce	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2007-10-21	Shawn O. Pearce	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| commitdiff \| raw \| diff to current
2007-10-19	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-19	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-18	Shawn O. Pearce	Merge branch 'jc/am-quiet'	blob \| commitdiff \| raw \| diff to current
2007-10-18	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-18	Shawn O. Pearce	Merge branch 'lt/diff-rename'	blob \| commitdiff \| raw \| diff to current
2007-10-17	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-16	Shawn O. Pearce	Merge branch 'master' into db/fetch-pack	blob \| commitdiff \| raw \| diff to current
2007-10-16	Shawn O. Pearce	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2007-10-03	Junio C Hamano	Merge branch 'mv/unknown'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom