Compute accurate distances in git-describe before output.
[git] / builtin-merge-file.c
2007-01-15  Junio C HamanoMerge git://git.kernel.org/pub/scm/gitk/gitk
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-27  Junio C HamanoMerge branch 'jc/fsck-reflog'
2006-12-25  Junio C HamanoMerge branch 'jc/skip-count'
2006-12-25  Junio C HamanoMerge branch 'jc/git-add--interactive'
2006-12-24  Junio C HamanoMerge branch 'sb/merge-friendly'
2006-12-24  Junio C HamanoMerge branch 'js/rerere'
2006-12-22  Johannes Schindelinmove read_mmfile() into xdiff-interface
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-06  Johannes Schindelinmerge-file: support -p and -q; fix compile warnings
2006-12-06  Johannes SchindelinAdd builtin merge-file, a minimal replacement for RCS...