aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-22 10:36:26 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-22 10:36:26 -0700
commitbf9e9542f94bc39e8bc653065d477bd25e79010e (patch)
treeed2db94a1a96b00f843e27a93229d0616e6368fc /diff.c
parentb8ca3fbd462f94b980af828528c8f1fa59601b57 (diff)
parent5ab2c0a47574c92f92ea3709b23ca35d96319edd (diff)
downloadgit-bf9e9542f94bc39e8bc653065d477bd25e79010e.tar.gz
git-bf9e9542f94bc39e8bc653065d477bd25e79010e.tar.xz
Merge branch 'master' into nextv1.4.1-rc1
* master: git-svn: fix commit --edit flag when using SVN:: libraries Makefile: do not force unneeded recompilation upon GIT_VERSION changes Check and document the options to prevent mistakes. Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions