Ignore git-init and git-remote
[git] / merge-file.c
2007-01-05  Junio C HamanoMerge branch 'maint'
2006-12-27  Junio C HamanoMerge branch 'master' into js/shallow
2006-12-22  Junio C HamanoMerge branch 'maint'
2006-12-20  Junio C HamanoMerge branch 'maint'
2006-12-18  Junio C HamanoMerge branch 'jn/web' (early part)
2006-12-14  Junio C HamanoMerge branch 'maint'
2006-12-14  Junio C HamanoMerge branch 'jc/diff--cached'
2006-12-13  Junio C HamanoMerge branch 'jc/read-tree-ignore'
2006-12-13  Junio C HamanoMerge branch 'ew/rerere'
2006-12-13  Junio C HamanoMerge branch 'np/addcommit'
2006-12-13  Junio C HamanoMerge branch 'lh/branch-rename'
2006-12-13  Junio C HamanoMerge branch 'jc/commit-careful'
2006-12-13  Junio C HamanoMerge branch 'ap/clone-origin'
2006-12-13  Junio C HamanoMerge branch 'jc/numstat'
2006-12-13  Junio C HamanoMerge branch 'rr/cvsexportcommit'
2006-12-13  Junio C HamanoMerge branch 'ap/branch'
2006-12-13  Junio C HamanoMerge branch 'js/merge'
2006-12-13  Junio C HamanoMerge branch 'master' into js/merge
2006-12-13  Johannes SchindelinGet rid of the dependency on RCS' merge program
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-07  Junio C HamanoMerge branch 'jc/daemon'
2006-09-03  Junio C HamanoMerge branch 'master' into cc/trace
2006-09-02  Shawn PearceReplace uses of strdup with xstrdup.
2006-09-01  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-13  Junio C HamanoMerge branch 'jc/upload-pack'
2006-08-13  Junio C HamanoMerge branch 'th/diff-extra'
2006-08-13  Junio C HamanoGIT 1.4.2 v1.4.2
2006-08-13  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-08  Junio C HamanoMerge branch 'master' into pb/gitpm
2006-07-30  Junio C HamanoMerge branch 'jn/make'
2006-07-26  Junio C HamanoMerge branch 'pb/configure'
2006-07-17  Junio C HamanoMerge branch 'sp/reflog' v1.4.2-rc1
2006-07-13  Junio C HamanoMerge branch 'ml/trace'
2006-07-13  Junio C HamanoMerge branch 'js/merge-base'
2006-07-13  Junio C HamanoMerge branch 'lt/prune'
2006-07-13  Junio C HamanoMerge branch 'lt/merge-tree'
2006-06-29  Linus TorvaldsImproved three-way blob merging code