Refactor merge strategies into separate includable file.
[git] / setup.c
2005-10-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-10-03  Peter AnvinMerge with master.kernel.org:/pub/scm/git/git.git
2005-10-02  Junio C HamanoAdd git-symbolic-ref
2005-09-27  Junio C HamanoMerge http://www.kernel.org/pub/scm/gitk/gitk
2005-09-25  Junio C HamanoDiff clean-up.
2005-09-09  Junio C HamanoRetire support for old environment variables.
2005-08-30  Junio C HamanoMerge refs/heads/master from paulus
2005-08-29  Junio C HamanoMerge refs/heads/portable from cs.berkeley.edu/~ejr...
2005-08-29  Junio C HamanoMerge refs/heads/master from .
2005-08-28  Linus Torvalds[PATCH] Make .git directory validation code test HEAD
2005-08-19  Junio C HamanoMerge from gitk
2005-08-18  Junio C HamanoMerge with gitk --parents change.
2005-08-18  Junio C HamanoMerge with gitk
2005-08-17  Junio C HamanoMerge from master for misc fixes.
2005-08-17  Linus Torvalds[PATCH] Export relative path handling "prefix_path...
2005-08-17  Junio C HamanoMerge with master to get diff fixes.
2005-08-17  Linus Torvalds[PATCH] Improve handling of "." and ".." in git-diff-*
2005-08-17  Linus Torvalds[PATCH] Fix test failure due to overly strict .git...
2005-08-17  Linus Torvalds[PATCH] Make "git diff" work inside relative subdirectories