summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2008-03-01 01:22:55 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-01 01:31:18 -0800
commitc14918415a36e93a84ed1f58ce079619f84e26fa (patch)
treea3f2acacf39cd9aa13e3febe99a11dbf38fa4efc /git-merge.sh
parentrename: warn user when we have turned off rename detection (diff)
downloadtgif-c14918415a36e93a84ed1f58ce079619f84e26fa.tar.xz
allow git-am to run in a subdirectory
We just move to the top of the tree and proceed. This shouldn't break any existing callers, since the behavior was previously disallowed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions