summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2015-05-29 03:25:45 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-29 09:21:27 -0700
commite25c7cc146177a59f31ca07cdd094e0566e1e4be (patch)
tree4f521c9c3829863c6543cd4882400f2acddc2744 /Documentation/git-merge-file.txt
parentGit 2.2.2 (diff)
downloadtgif-e25c7cc146177a59f31ca07cdd094e0566e1e4be.tar.xz
Makefile: drop dependency between git-instaweb and gitweb
The rule for "git-instaweb" depends on "gitweb". This makes no sense, because: 1. git-instaweb has no build-time dependency on gitweb; it is a run-time dependency 2. gitweb is a directory that we want to recursively make in. As a result, its recipe is marked .PHONY, which causes "make" to rebuild git-instaweb every time it is run. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions