Andrew's git - gitweb.git/history

[gitweb.git] / merge-index.c

2006-12-27	Merge branch 'master' into js/shallow	blob \| diff \| raw
2006-12-25	Merge branch 'jc/git-add--interactive'	blob \| diff \| raw
2006-12-22	Merge branch 'maint'	blob \| diff \| raw
2006-12-21	Merge branch 'ew/svn-pm'	blob \| diff \| raw
2006-12-20	Merge branch 'jc/leftright'	blob \| diff \| raw
2006-12-20	Merge branch 'jc/blame'	blob \| diff \| raw
2006-12-20	Merge branch 'jc/branch-remove-remote'	blob \| diff \| raw
2006-12-20	Merge branch 'jc/clone'	blob \| diff \| raw
2006-12-20	Merge branch 'maint'	blob \| diff \| raw
2006-12-20	simplify inclusion of system header files.	blob \| diff \| raw
2006-11-29	Merge master.kernel.org:/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-11-24	Merge branch 'jc/upload-pack'	blob \| diff \| raw \| diff to current
2006-11-08	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-10-17	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-02	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-10-01	Merge branch 'jc/gitpm'	blob \| diff \| raw \| diff to current
2006-09-18	Merge part of branch 'jc/upload-pack'	blob \| diff \| raw \| diff to current
2006-09-14	Merge branches 'maint' and 'jc/http'	blob \| diff \| raw \| diff to current
2006-09-01	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2006-08-28	Merge branch 'js/c-merge-recursive'	blob \| diff \| raw \| diff to current
2006-08-23	Merge branch 'gl/cleanup' into gl/cleanup-next	blob \| diff \| raw \| diff to current
2006-08-21	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-08-17	Merge branch 'jc/format-patch'	blob \| diff \| raw \| diff to current
2006-08-16	Merge branch 'jc/racy'	blob \| diff \| raw \| diff to current
2006-08-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-08-16	remove unnecessary initializations	blob \| diff \| raw \| diff to current
2006-08-16	Merge branch 'maint'	blob \| diff \| raw \| diff to current
2006-08-15	use appropriate typedefs	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-05	Merge branch 'jc/sha1'	blob \| diff \| raw \| diff to current
2006-06-29	Merge branch 'jc/repack'	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'jc/squash'	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'jc/diff'	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'ml/cvsimport'	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'js/diff'	blob \| diff \| raw \| diff to current
2006-06-26	Merge branch 'ew/rebase'	blob \| diff \| raw \| diff to current
2006-06-26	Solaris needs inclusion of signal.h for signal()	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'js/lsfix'	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'ew/rebase'	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'jn/web'	blob \| diff \| raw \| diff to current
2006-06-22	Merge early parts of branch 'js/diff'	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'jc/upload-corrupt'	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'ew/rebase' into next	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'jn/web' into next	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'jc/waitpid'	blob \| diff \| raw \| diff to current
2006-06-22	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-06-21	Merge branch 'jc/upload-corrupt' into next	blob \| diff \| raw \| diff to current
2006-06-21	Merge branch 'jn/web' into next	blob \| diff \| raw \| diff to current
2006-06-21	Merge branch 'ew/rebase' into next	blob \| diff \| raw \| diff to current
2006-06-21	Merge branch 'ff/c99' into next	blob \| diff \| raw \| diff to current
2006-06-21	Merge branch 'jc/upload-corrupt' into next	blob \| diff \| raw \| diff to current
2006-06-21	Merge branch 'jn/web' into next	blob \| diff \| raw \| diff to current
2006-06-21	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-06-20	Merge branch 'jn/web' into next	blob \| diff \| raw \| diff to current
2006-06-20	Merge branch 'jn/web' into next	blob \| diff \| raw \| diff to current
2006-06-20	Merge branch 'master' into next	blob \| diff \| raw \| diff to current
2006-06-20	Merge branch 'jn/web' into next	blob \| diff \| raw \| diff to current
2006-06-20	Merge branch 'pb/config' into next	blob \| diff \| raw \| diff to current
2006-06-20	Merge branch 'jc/waitpid' into next	blob \| diff \| raw \| diff to current
2006-06-20	Restore SIGCHLD to SIG_DFL where we care about waitpid().	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-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-05	Merge git://git.kernel.org/pub/scm/gitk/gitk	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-26	Merge git://git.kernel.org/pub/scm/gitk/gitk	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-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-09-08	Big tool rename.	blob \| diff \| raw \| diff to current