]> git.ipfire.org Git - thirdparty/git.git/history - merge-index.c
GIT-VERSION-FILE: check ./version first.
[thirdparty/git.git] / merge-index.c
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-13  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2007-02-12  Junio C HamanoMerge git-gui
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-14  Shawn O. PearceMerge branch 'master' into sp/fast-import
2007-01-09  Junio C HamanoMerge branch 'maint'
2007-01-05  Junio C HamanoMerge branch 'maint'
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive'
2006-12-22  Junio C HamanoMerge branch 'maint'
2006-12-21  Junio C HamanoMerge branch 'ew/svn-pm'
2006-12-20  Junio C HamanoMerge branch 'jc/leftright'
2006-12-20  Junio C HamanoMerge branch 'jc/blame'
2006-12-20  Junio C HamanoMerge branch 'jc/branch-remove-remote'
2006-12-20  Junio C HamanoMerge branch 'jc/clone'
2006-12-20  Junio C HamanoMerge branch 'maint'
2006-12-20  Junio C Hamanosimplify inclusion of system header files.
2006-11-29  Junio C HamanoMerge master.kernel.org:/pub/scm/gitk/gitk
2006-11-24  Junio C HamanoMerge branch 'jc/upload-pack'
2006-11-08  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-10-17  Junio C HamanoMerge branch 'maint'
2006-10-02  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'maint'
2006-10-01  Junio C HamanoMerge branch 'jc/gitpm'
2006-09-18  Junio C HamanoMerge part of branch 'jc/upload-pack'
2006-09-14  Junio C HamanoMerge branches 'maint' and 'jc/http'
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28  Junio C HamanoMerge branch 'js/c-merge-recursive'
2006-08-23  Junio C HamanoMerge branch 'gl/cleanup' into gl/cleanup-next
2006-08-21  Junio C HamanoMerge branch 'maint'
2006-08-17  Junio C HamanoMerge branch 'jc/format-patch'
2006-08-16  Junio C HamanoMerge branch 'jc/racy'
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-16  David Rientjesremove unnecessary initializations
2006-08-16  Junio C HamanoMerge branch 'maint'
2006-08-15  David Rientjesuse appropriate typedefs
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-07-05  Junio C HamanoMerge branch 'jc/sha1'
2006-06-29  Junio C HamanoMerge branch 'jc/repack'
2006-06-26  Junio C HamanoMerge branch 'jc/squash'
2006-06-26  Junio C HamanoMerge branch 'jc/diff'
2006-06-26  Junio C HamanoMerge branch 'ml/cvsimport'
2006-06-26  Junio C HamanoMerge branch 'js/diff'
2006-06-26  Junio C HamanoMerge branch 'ew/rebase'
2006-06-26  Dennis StosbergSolaris needs inclusion of signal.h for signal()
2006-06-22  Junio C HamanoMerge branch 'js/lsfix'
2006-06-22  Junio C HamanoMerge branch 'ew/rebase'
2006-06-22  Junio C HamanoMerge branch 'jn/web'
2006-06-22  Junio C HamanoMerge early parts of branch 'js/diff'
2006-06-22  Junio C HamanoMerge branch 'jc/upload-corrupt'
2006-06-22  Junio C HamanoMerge branch 'ew/rebase' into next
2006-06-22  Junio C HamanoMerge branch 'jn/web' into next
2006-06-22  Junio C HamanoMerge branch 'jc/waitpid'
2006-06-22  Junio C HamanoMerge branch 'master' into next
2006-06-21  Junio C HamanoMerge branch 'jc/upload-corrupt' into next
2006-06-21  Junio C HamanoMerge branch 'jn/web' into next
2006-06-21  Junio C HamanoMerge branch 'ew/rebase' into next
2006-06-21  Junio C HamanoMerge branch 'ff/c99' into next
2006-06-21  Junio C HamanoMerge branch 'jc/upload-corrupt' into next
2006-06-21  Junio C HamanoMerge branch 'jn/web' into next
2006-06-21  Junio C HamanoMerge branch 'master' into next
2006-06-20  Junio C HamanoMerge branch 'jn/web' into next
2006-06-20  Junio C HamanoMerge branch 'jn/web' into next
2006-06-20  Junio C HamanoMerge branch 'master' into next
2006-06-20  Junio C HamanoMerge branch 'jn/web' into next
2006-06-20  Junio C HamanoMerge branch 'pb/config' into next
2006-06-20  Junio C HamanoMerge branch 'jc/waitpid' into next
2006-06-20  Junio C HamanoRestore SIGCHLD to SIG_DFL where we care about waitpid().
2006-06-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-10  Junio C HamanoMerge git://git.kernel.org/pub/scm/git/gitweb
2006-06-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-06-04  Junio C HamanoMerge branch 'new' of git://git.kernel.org/pub/scm...
2006-06-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-05-03  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-24  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-17  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-04-05  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-31  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-03-26  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-22  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-02-07  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2005-12-07  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-12-04  Junio C HamanoGIT 0.99.9l aka 1.0rc4 v0.99.9l v1.0rc4
2005-11-30  Junio C HamanoMerge branch 'jc/subdir'
2005-11-29  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-29  Junio C HamanoMake the rest of commands work from a subdirectory.
2005-11-28  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-22  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-20  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-11-19  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-08  Junio C HamanoBig tool rename.