merge-one-file: use common as base, instead of emptiness.
[git] / git-diff.sh
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-23  Junio C HamanoMerge branch 'fixes'
2005-10-21  Junio C HamanoMerge branch 'fixes'
2005-10-18  Linus TorvaldsTeach "git diff" to handle filenames starting with '-'
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-23  Junio C HamanoMerge branch 'fixes'
2005-09-23  Junio C HamanoMake 'git diff --cached' synonymous to 'git diff -...
2005-09-08  Junio C HamanoBig tool rename.