Andrew's git - gitweb.git/history

[gitweb.git] / merge-base.c

2006-09-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw
2006-08-28	Merge branch 'js/c-merge-recursive'	blob \| diff \| raw
2006-08-23	Merge branch 'gl/cleanup' into gl/cleanup-next	blob \| diff \| raw
2006-08-21	Merge branch 'maint'	blob \| diff \| raw
2006-08-17	Merge branch 'jc/format-patch'	blob \| diff \| raw
2006-08-16	Merge branch 'jc/racy'	blob \| diff \| raw
2006-08-16	Merge branch 'maint'	blob \| diff \| raw
2006-08-16	remove unnecessary initializations	blob \| diff \| raw
2006-08-13	Merge branch 'th/diff-extra'	blob \| diff \| raw \| diff to current
2006-08-13	GIT 1.4.2 v1.4.2	blob \| diff \| raw \| diff to current
2006-08-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-07-30	Merge branch 'jn/make'	blob \| diff \| raw \| diff to current
2006-07-26	Merge branch 'pb/configure'	blob \| diff \| raw \| diff to current
2006-07-13	Merge branch 'lt/merge-tree'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'jc/rename'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'jc/grep'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'jc/mailinfo'	blob \| diff \| raw \| diff to current
2006-07-10	Merge branch 'ew/svn'	blob \| diff \| raw \| diff to current
2006-07-07	Merge branch 'js/merge-base'	blob \| diff \| raw \| diff to current
2006-07-03	Merge branch 'master' into js/merge-base	blob \| diff \| raw \| diff to current
2006-07-02	Fold get_merge_bases_clean() into get_merge_bases()	blob \| diff \| raw \| diff to current
2006-06-29	move get_merge_bases() to core lib.	blob \| diff \| raw \| diff to current
2006-06-29	refactor merge_bases() as preparation to libify merge...	blob \| diff \| raw \| diff to current
2006-06-18	Merge branch 'jc/rw-prefix'	blob \| diff \| raw \| diff to current
2006-06-13	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-06-10	Merge git://git.kernel.org/pub/scm/git/gitweb	blob \| diff \| raw \| diff to current
2006-06-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-06-04	Merge branch 'new' of git://git./gitk/gitk into next	blob \| diff \| raw \| diff to current
2006-06-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-05-29	Merge branch 'jc/dirwalk-n-cache-tree' into jc/cache...	blob \| diff \| raw \| diff to current
2006-05-28	Merge branch 'jc/cache-tree' into next	blob \| diff \| raw \| diff to current
2006-05-21	Merge branch 'master' into js/fmt-patch	blob \| diff \| raw \| diff to current
2006-05-20	Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache...	blob \| diff \| raw \| diff to current
2006-05-20	Merge branch 'js/fetchconfig'	blob \| diff \| raw \| diff to current
2006-05-19	Merge branch 'jc/apply'	blob \| diff \| raw \| diff to current
2006-05-19	Merge part of 'js/fmt-patch' for RFC2822 dates into...	blob \| diff \| raw \| diff to current
2006-05-17	Merge branch 'jc/apply' into next	blob \| diff \| raw \| diff to current
2006-05-17	Merge branch 'jc/apply'	blob \| diff \| raw \| diff to current
2006-05-17	Merge branch 'jc/gitlink' into next	blob \| diff \| raw \| diff to current
2006-05-17	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-05-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-05-17	merge-base: Clarify the comments on post processing.	blob \| diff \| raw \| diff to current
2006-05-16	Merge branch 'jc/grep'	blob \| diff \| raw \| diff to current
2006-05-15	Merge branch 'jc/grep' into next	blob \| diff \| raw \| diff to current
2006-05-15	Merge branch 'jc/grep' into next	blob \| diff \| raw \| diff to current
2006-05-10	Merge branch 'jc/grep' into next	blob \| diff \| raw \| diff to current
2006-05-09	Merge branch 'mw/alternates'	blob \| diff \| raw \| diff to current
2006-05-09	Merge branch 'jc/xsha1'	blob \| diff \| raw \| diff to current
2006-05-09	Merge branch 'jc/again'	blob \| diff \| raw \| diff to current
2006-05-09	Merge branch 'np/delta'	blob \| diff \| raw \| diff to current
2006-05-09	Merge branch 'jc/bindiff'	blob \| diff \| raw \| diff to current
2006-05-09	Merge branch 'jc/grep' into next	blob \| diff \| raw \| diff to current
2006-05-09	Merge branch 'tojunio' of locke.catalyst.net.nz/git...	blob \| diff \| raw \| diff to current
2006-05-08	Merge branch 'jc/clean' into next	blob \| diff \| raw \| diff to current
2006-05-08	Merge branch 'fix'	blob \| diff \| raw \| diff to current
2006-05-08	Separate object name errors from usage errors	blob \| diff \| raw \| diff to current
2006-05-03	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-24	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-17	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-07	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-04-05	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-04-05	Merge branch 'fix'	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'lt/fix-sol-pack'	blob \| diff \| raw \| diff to current
2006-04-04	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw \| diff to current
2006-04-02	Merge branch 'lt/fix-sol-pack' into next	blob \| diff \| raw \| diff to current
2006-03-31	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-03-28	Merge branch ak/svn	blob \| diff \| raw \| diff to current
2006-03-27	Merge branch 'lt/diffgen' into next	blob \| diff \| raw \| diff to current
2006-03-26	Merge branches 'jc/clone' and 'jc/name'	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'lt/diffgen' into next	blob \| diff \| raw \| diff to current
2006-03-26	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'ew/email' into next	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'lt/diffgen' into next	blob \| diff \| raw \| diff to current
2006-03-26	Merge branch 'rs/tar-tree' into next	blob \| diff \| raw \| diff to current
2006-03-24	Merge branch 'jc/name' into next	blob \| diff \| raw \| diff to current
2006-03-24	sha1_name: warning ambiguous refs.	blob \| diff \| raw \| diff to current
2006-02-22	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-02-07	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-12-07	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-12-04	GIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4	blob \| diff \| raw \| diff to current
2005-11-30	Merge branch 'jc/subdir'	blob \| diff \| raw \| diff to current
2005-11-29	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-29	Make the rest of commands work from a subdirectory.	blob \| diff \| raw \| diff to current
2005-11-28	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-27	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-22	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-20	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-19	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-11-12	GIT 0.99.9h v0.99.9h v1.0rc1	blob \| diff \| raw \| diff to current
2005-11-11	Merge branches 'jc/sb' and 'jc/mb'	blob \| diff \| raw \| diff to current
2005-11-11	merge-base: avoid unnecessary postprocessing.	blob \| diff \| raw \| diff to current
2005-11-11	merge-base: fully contaminate the well.	blob \| diff \| raw \| diff to current
2005-10-27	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-09-27	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2005-08-30	Merge refs/heads/master from paulus	blob \| diff \| raw \| diff to current
2005-08-29	Merge refs/heads/portable from cs.berkeley.edu/~ejr...	blob \| diff \| raw \| diff to current
2005-08-24	Merge refs/heads/master from .	blob \| diff \| raw \| diff to current
2005-08-24	Try to find the optimum merge base while resolving.	blob \| diff \| raw \| diff to current
2005-08-19	Merge from gitk	blob \| diff \| raw \| diff to current
next