summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2010-07-24 18:07:53 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-25 23:14:19 -0700
commit662c83ff8ffa714efab5d7d530bd7d4f82e3ef03 (patch)
treea29f7fb6bea1c08d3e788202cf17a2494e492dcc /Documentation/git-merge.txt
parentCast execl*() NULL sentinels to (char *) (diff)
downloadtgif-662c83ff8ffa714efab5d7d530bd7d4f82e3ef03.tar.xz
Document receive.denyDeleteCurrent
This option was introduced by 747ca24 (receive-pack: receive.denyDeleteCurrent, 2009-02-08) but never documented. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions