summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 12:46:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 12:46:18 -0700
commit6b6547b46f6f3d6895b61467604ee1f4d98b5a7f (patch)
treeeed9b91c5848bc41dbd1d18ef824723ea1851b90 /builtin/merge-index.c
parentdoc/Makefile: drop doc-diff worktree and temporary files on "make clean" (diff)
downloadtgif-6b6547b46f6f3d6895b61467604ee1f4d98b5a7f.tar.xz
Revert "doc/Makefile: drop doc-diff worktree and temporary files on "make clean""
This reverts commit 6f924265a0bf6efa677e9a684cebdde958e5ba06, which started to require that we have an executable git available in order to say "make clean", which gives us a chicken-and-egg problem. Having to have Git installed, or be in a repository, in order to be able to run an optional "doc-diff" tool is fine. Requiring either in order to run "make clean" is a different story. Reported by Jonathan Nieder <jrnieder@gmail.com>.
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions