[PATCH] honor --author even with --amend, -C, and -c.
[gitweb.git] / builtin-merge-file.c
2007-01-15 Merge git://git.kernel.org/pub/scm/gitk/gitk
2007-01-09 Merge branch 'maint'
2007-01-05 Merge branch 'maint'
2006-12-27 Merge branch 'master' into js/shallow
2006-12-27 Merge branch 'jc/fsck-reflog'
2006-12-25 Merge branch 'jc/skip-count'
2006-12-25 Merge branch 'jc/git-add--interactive'
2006-12-24 Merge branch 'sb/merge-friendly'
2006-12-24 Merge branch 'js/rerere'
2006-12-22 move read_mmfile() into xdiff-interface
2006-12-22 Merge branch 'maint'
2006-12-20 Merge branch 'maint'
2006-12-18 Merge branch 'jn/web' (early part)
2006-12-14 Merge branch 'maint'
2006-12-14 Merge branch 'jc/diff--cached'
2006-12-13 Merge branch 'jc/read-tree-ignore'
2006-12-13 Merge branch 'ew/rerere'
2006-12-13 Merge branch 'np/addcommit'
2006-12-13 Merge branch 'lh/branch-rename'
2006-12-13 Merge branch 'jc/commit-careful'
2006-12-13 Merge branch 'ap/clone-origin'
2006-12-13 Merge branch 'jc/numstat'
2006-12-13 Merge branch 'rr/cvsexportcommit'
2006-12-13 Merge branch 'ap/branch'
2006-12-13 Merge branch 'js/merge'
2006-12-13 Merge branch 'master' into js/merge
2006-12-06 merge-file: support -p and -q; fix compile warnings
2006-12-06 Add builtin merge-file, a minimal replacement for RCS...