Andrew's git - gitweb.git/history

[gitweb.git] / merge-recursive.c

2008-02-21	Merge branch 'bc/fopen'	blob \| diff \| raw
2008-02-21	Merge branch 'jc/setup'	blob \| diff \| raw
2008-02-21	Merge branch 'maint'	blob \| diff \| raw
2008-02-20	Merge branch 'maint'	blob \| diff \| raw
2008-02-19	Merge branch 'mk/maint-parse-careful'	blob \| diff \| raw
2008-02-18	merge-recursive: split low-level merge functions out.	blob \| diff \| raw \| diff to current
2008-02-18	deref_tag: handle return value NULL	blob \| diff \| raw
2008-02-18	Merge branch 'br/gitweb'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'bd/qsort'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'sp/safecrlf'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'cc/browser'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'jc/gitignore-ends-with-slash'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'pb/prepare-commit-msg'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'jk/noetcconfig'	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'jc/submittingpatches'	blob \| diff \| raw \| diff to current
2008-02-17	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-02-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-02-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-13	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-13	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-02-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-02-12	Merge branch 'db/no-separate-ls-remote-connection'...	blob \| diff \| raw \| diff to current
2008-02-12	Merge branch 'mw/send-email'	blob \| diff \| raw \| diff to current
2008-02-12	Merge branch 'db/send-email-omit-cc'	blob \| diff \| raw \| diff to current
2008-02-12	Merge branch 'jc/error-message-in-cherry-pick'	blob \| diff \| raw \| diff to current
2008-02-12	Merge branch 'lt/in-core-index'	blob \| diff \| raw \| diff to current
2008-02-12	Merge branch 'ph/describe-match'	blob \| diff \| raw \| diff to current
2008-02-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2008-02-11	merge-recursive.c: guard config parser from value=NULL	blob \| diff \| raw \| diff to current
2008-02-10	Build-in merge-recursive	blob \| diff \| raw
2008-01-24	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-01-21	Make on-disk index representation separate from in...	blob \| diff \| raw \| diff to current
2008-01-21	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-01-21	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-01-21	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2008-01-16	Improve use of lockfile API	blob \| diff \| raw \| diff to current
2008-01-11	Merge ../gitk	blob \| diff \| raw \| diff to current
2008-01-09	Merge branch 'master' of git://git./gitk/gitk	blob \| diff \| raw \| diff to current
2008-01-08	Merge in GIT 1.5.3.8	blob \| diff \| raw \| diff to current
2008-01-05	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2008-01-03	Fix grammar nits in documentation and in code comments.	blob \| diff \| raw \| diff to current
2007-12-31	Merge branch 'maint' of git://linux-nfs.org/~bfields/git	blob \| diff \| raw \| diff to current
2007-12-20	Improved submodule merge support	blob \| diff \| raw \| diff to current
2007-12-18	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-13	Merge branch 'cc/help'	blob \| diff \| raw \| diff to current
2007-12-13	Merge branch 'jc/shortlog-e'	blob \| diff \| raw \| diff to current
2007-12-13	Merge branch 'ew/svn-rev-db'	blob \| diff \| raw \| diff to current
2007-12-13	Merge branch 'jc/merge-recursive-gitlink'	blob \| diff \| raw \| diff to current
2007-12-11	Support a merge with conflicting gitlink change	blob \| diff \| raw \| diff to current
2007-12-09	Merge branch 'jc/spht'	blob \| diff \| raw \| diff to current
2007-12-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-07	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-12-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-12-02	Merge branch 'tt/help'	blob \| diff \| raw \| diff to current
2007-12-01	Merge 1.5.3.7 in	blob \| diff \| raw \| diff to current
2007-12-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-29	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-26	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-25	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-25	Merge branch 'jk/send-pack'	blob \| diff \| raw \| diff to current
2007-11-25	Merge branch 'js/mingw-fallouts'	blob \| diff \| raw \| diff to current
2007-11-25	Merge branch 'mh/rebase-skip-hard'	blob \| diff \| raw \| diff to current
2007-11-25	Merge branch 'cc/bisect'	blob \| diff \| raw \| diff to current
2007-11-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-23	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-21	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2007-11-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-19	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-19	Merge branch 'lt/rev-list-gitlink'	blob \| diff \| raw \| diff to current
2007-11-19	Merge branch 'ds/checkout-upper'	blob \| diff \| raw \| diff to current
2007-11-19	Merge branch 'sh/p4'	blob \| diff \| raw \| diff to current
2007-11-19	Merge branch 'lt/rev-list-interactive'	blob \| diff \| raw \| diff to current
2007-11-18	Merge branch 'ph/diffopts'	blob \| diff \| raw \| diff to current
2007-11-18	Merge branch 'maint' to synchronize with 1.5.3.6	blob \| diff \| raw \| diff to current
2007-11-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'bs/maint-commit-options'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'rv/maint-index-commit'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'bs/maint-t7005'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'jc/maint-add-sync-stat'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'jc/stash-create'	blob \| diff \| raw \| diff to current
2007-11-14	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-12	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-12	Merge branch 'sp/maint-plug-traverse-commit-list-leak...	blob \| diff \| raw \| diff to current
2007-11-12	Make the diff_options bitfields be an unsigned with...	blob \| diff \| raw \| diff to current
2007-11-11	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-10	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-09	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-08	Merge branch 'jc/clean-config'	blob \| diff \| raw \| diff to current
2007-11-08	Merge branch 'ds/maint-deflatebound'	blob \| diff \| raw \| diff to current
2007-11-08	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-06	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-04	Merge branch 'jc/revert-merge'	blob \| diff \| raw \| diff to current
2007-11-04	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2007-11-02	Merge branch 'np/progress'	blob \| diff \| raw \| diff to current
2007-11-02	Merge branch 'gp/maint-diffdoc'	blob \| diff \| raw \| diff to current
next