Andrew's git - gitweb.git/history - builtin-merge-recursive.c

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

2009-01-14	Merge branch 'fe/cvsserver'	blob \| diff \| raw
2009-01-14	Merge branch 'js/maint-bisect-gitk'	blob \| diff \| raw
2009-01-14	Merge branch 'np/no-loosen-prune-expire-now'	blob \| diff \| raw
2009-01-14	Merge branch 'cb/maint-unpack-trees-absense'	blob \| diff \| raw
2009-01-14	Merge branch 'mc/cd-p-pwd'	blob \| diff \| raw
2009-01-14	Merge branch 'mh/cherry-default'	blob \| diff \| raw
2009-01-13	Merge branch 'maint'	blob \| diff \| raw
2009-01-13	Merge branch 'cb/maint-merge-recursive-fix' into maint	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'ap/maint-apply-modefix' into maint	blob \| diff \| raw \| diff to current
2009-01-13	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-12	Merge branch 'maint'	blob \| diff \| raw
2009-01-12	Merge branch 'jc/maint-do-not-switch-to-non-commit...	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'mh/maint-sendmail-cc-doc'	blob \| diff \| raw
2009-01-07	Merge branch 'rs/diff-ihc'	blob \| diff \| raw
2009-01-07	Merge branch 'js/maint-merge-recursive-r-d-conflict'	blob \| diff \| raw
2009-01-07	Merge branch 'mk/gitweb-feature'	blob \| diff \| raw
2009-01-07	Merge branch 'cb/merge-recursive-fix'	blob \| diff \| raw
2009-01-07	Merge branch 'kk/maint-http-push'	blob \| diff \| raw
2009-01-07	Merge branch 'mv/um-pdf'	blob \| diff \| raw
2009-01-07	Merge branch 'jn/gitweb-blame'	blob \| diff \| raw
2009-01-07	Merge branch 'wp/add-p-goto'	blob \| diff \| raw
2009-01-07	Merge branch 'maint'	blob \| diff \| raw
2009-01-07	Merge branch 'maint-1.6.0' into maint	blob \| diff \| raw \| diff to current
2009-01-07	Merge branch 'maint-1.5.6' into maint-1.6.0	blob \| diff \| raw \| diff to current
2009-01-06	Merge branch 'maint'	blob \| diff \| raw
2009-01-05	remove trailing LF in die() messages	blob \| diff \| raw
2009-01-03	Merge branch 'jc/maint-do-not-switch-to-non-commit'	blob \| diff \| raw \| diff to current
2009-01-03	Merge branch 'ap/maint-apply-modefix'	blob \| diff \| raw \| diff to current
2008-12-27	Merge branch 'sp/maint-describe-all-tag-warning' into...	blob \| diff \| raw \| diff to current
2008-12-22	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-22	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-12-20	Merge branch 'maint' to sync with GIT 1.6.0.6	blob \| diff \| raw \| diff to current
2008-12-20	GIT 1.6.0.6 v1.6.0.6	blob \| diff \| raw \| diff to current
2008-12-18	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-12-17	GIT 1.5.6.6 v1.5.6.6	blob \| diff \| raw \| diff to current
2008-12-17	GIT 1.5.5.6 v1.5.5.6	blob \| diff \| raw \| diff to current
2008-12-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-15	Merge branch 'cb/maint-merge-recursive-fix' into cb...	blob \| diff \| raw \| diff to current
2008-12-15	merge-recursive: do not clobber untracked working tree...	blob \| diff \| raw \| diff to current
2008-12-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-12-02	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-12-02	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-12-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-12-01	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-12-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-28	Merge branch 'js/mingw-rename-fix'	blob \| diff \| raw \| diff to current
2008-11-28	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-27	Merge branch 'rw/maint-typofix' into rw/typofix	blob \| diff \| raw \| diff to current
2008-11-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-26	Merge branch 'mm/maint-sort-config-doc' into mm/sort...	blob \| diff \| raw \| diff to current
2008-11-24	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-16	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-11-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-16	Merge branch 'bc/maint-keep-pack'	blob \| diff \| raw \| diff to current
2008-11-15	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'jk/maint-commit-v-strip'	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'mk/maint-cg-push'	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'bc/maint-keep-pack'	blob \| diff \| raw \| diff to current
2008-11-13	Merge branch 'st/tag'	blob \| diff \| raw \| diff to current
2008-11-13	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-11-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-12	Merge branch 'jk/maint-commit-v-strip' into jk/commit...	blob \| diff \| raw \| diff to current
2008-11-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-05	Merge branch 'mv/maint-branch-m-symref'	blob \| diff \| raw \| diff to current
2008-11-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'sh/rebase-i-p'	blob \| diff \| raw \| diff to current
2008-11-03	Merge branch 'cj/maint-gitpm-fix-maybe-self'	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'js/maint-fetch-update-head' into maint	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-11-02	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-11-02	Merge branch 'maint' of git://repo.or.cz/git-gui into...	blob \| diff \| raw \| diff to current
2008-10-31	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-31	Merge branch 'ar/maint-mksnpath' into ar/mksnpath	blob \| diff \| raw \| diff to current
2008-10-27	Merge branch 'ar/maint-mksnpath' into HEAD	blob \| diff \| raw \| diff to current
2008-10-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-22	Merge branch 'js/maint-fetch-update-head'	blob \| diff \| raw \| diff to current
2008-10-22	Merge branch 'jc/maint-co-track'	blob \| diff \| raw \| diff to current
2008-10-21	Merge branch 'jc/maint-reset-remove-unmerged-new'	blob \| diff \| raw \| diff to current
2008-10-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'sh/maint-rebase3'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'tr/workflow-doc'	blob \| diff \| raw \| diff to current
2008-10-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'db/maint-checkout-b' into maint	blob \| diff \| raw \| diff to current
2008-10-18	Merge branch 'pb/commit-where'	blob \| diff \| raw \| diff to current
2008-10-17	Merge branch 'jk/maint-ls-files-other' into jk/fix...	blob \| diff \| raw \| diff to current
2008-10-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
next