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-04-12	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-04-09	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-04-09	Junio C Hamano	Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1	blob \| commitdiff \| raw
2009-04-09	Junio C Hamano	Merge branch 'bc/maint-1.6.1-branch-deleted-was' into...	blob \| commitdiff \| raw
2009-04-09	Junio C Hamano	Merge branch 'js/maint-1.6.0-exec-path-env' into maint...	blob \| commitdiff \| raw
2009-04-08	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-04-05	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-04-02	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-03-30	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-03-30	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-03-24	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-03-22	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-03-22	Junio C Hamano	Merge branch 'js/maint-1.6.0-path-normalize' into maint...	blob \| commitdiff \| raw
2009-03-22	Junio C Hamano	Merge branch 'jc/maint-1.6.0-pack-directory' into maint...	blob \| commitdiff \| raw
2009-03-13	Junio C Hamano	Merge branch 'maint-1.6.0' into maint-1.6.1	blob \| commitdiff \| raw
2009-03-13	Junio C Hamano	Merge branch 'en/maint-1.6.1-hash-object' into maint...	blob \| commitdiff \| raw
2009-03-13	Junio C Hamano	Merge branch 'js/maint-1.6.1-remote-remove-mirror'...	blob \| commitdiff \| raw
2009-03-13	Junio C Hamano	Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...	blob \| commitdiff \| raw
2009-02-28	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-12	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-11	Junio C Hamano	Merge branch 'maint-1.5.6' into maint	blob \| commitdiff \| raw
2009-02-11	Junio C Hamano	Merge branch 'maint-1.5.4' into maint-1.5.5	blob \| commitdiff \| raw
2009-02-10	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'sg/maint-gitdir-in-subdir' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'lt/maint-wrap-zlib' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'js/maint-all-implies-HEAD' into maint	blob \| commitdiff \| raw
2009-02-06	Junio C Hamano	Merge branch 'kc/maint-diff-bwi-fix' into maint	blob \| commitdiff \| raw
2009-02-04	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-04	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-03	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-02-01	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'jc/maint-format-patch-o-relative' into...	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'bs/maint-rename-populate-filespec' into...	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'mh/maint-commit-color-status' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'nd/grep-assume-unchanged' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'jc/maint-ls-tree' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'np/no-loosen-prune-expire-now' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'mc/cd-p-pwd' into maint	blob \| commitdiff \| raw
2009-01-29	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-27	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-27	Junio C Hamano	Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'cb/maint-unpack-trees-absense' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'tr/maint-no-index-fixes' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'rs/maint-shortlog-foldline' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'pj/maint-ldflags' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'pb/maint-git-pm-false-dir' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'js/maint-bisect-gitk' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'js/add-not-submodule' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'jc/maint-format-patch' into maint	blob \| commitdiff \| raw
2009-01-24	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-18	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-15	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-15	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-14	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'kk/maint-http-push' into maint	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'js/maint-merge-recursive-r-d-conflict...	blob \| commitdiff \| raw
2009-01-13	Junio C Hamano	Merge branch 'cb/maint-merge-recursive-fix' into maint	blob \| commitdiff \| raw \| diff to current
2009-01-13	Junio C Hamano	Merge branch 'ap/maint-apply-modefix' into maint	blob \| commitdiff \| raw \| diff to current
2009-01-13	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2009-01-12	Junio C Hamano	Merge branch 'jc/maint-do-not-switch-to-non-commit...	blob \| commitdiff \| raw \| diff to current
2009-01-07	Junio C Hamano	Merge branch 'maint-1.6.0' into maint	blob \| commitdiff \| raw \| diff to current
2008-12-27	Junio C Hamano	Merge branch 'sp/maint-describe-all-tag-warning' into...	blob \| commitdiff \| raw \| diff to current
2008-12-25	Johannes Schindelin	merge-recursive: mark rename/delete conflict as unmerged	blob \| commitdiff \| raw \| diff to current
2008-12-22	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-22	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-20	Junio C Hamano	Merge branch 'maint' to sync with GIT 1.6.0.6	blob \| commitdiff \| raw \| diff to current
2008-12-18	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-17	Junio C Hamano	GIT 1.5.5.6 v1.5.5.6	blob \| commitdiff \| raw
2008-12-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-13	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-11	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-10	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-07	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-06	Junio C Hamano	Merge branch 'jc/am-options'	blob \| commitdiff \| raw \| diff to current
2008-12-05	Alex Riesen	Report symlink failures in merge-recursive	blob \| commitdiff \| raw \| diff to current
2008-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-03	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-02	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-12-01	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-29	Junio C Hamano	Merge branch 'nd/narrow' (early part) into jc/add-i-t-a	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'cc/bisect-skip'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'js/mingw-rename-fix'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'st/levenshtein'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'cr/remote-update-v'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'rs/strbuf-expand'	blob \| commitdiff \| raw \| diff to current
2008-11-28	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-27	Junio C Hamano	Merge branch 'rw/maint-typofix' into rw/typofix	blob \| commitdiff \| raw \| diff to current
2008-11-26	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-26	Junio C Hamano	Merge branch 'mm/maint-sort-config-doc' into mm/sort...	blob \| commitdiff \| raw \| diff to current
2008-11-24	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-24	René Scharfe	merge-recursive: use strbuf_expand() instead of interpo...	blob \| commitdiff \| raw \| diff to current
2008-11-17	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2008-11-16	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
2008-11-16	Junio C Hamano	Merge branch 'bc/maint-keep-pack'	blob \| commitdiff \| raw \| diff to current
2008-11-15	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom