summaryrefslogtreecommitdiff
path: root/git-applypatch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-04 05:28:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-05 00:04:44 (GMT)
commitc2d5036de5c2e21fb736002ae5b385ceb7c6b23b (patch)
tree79850cb02b25c4045feddaefe408aed22a7101e5 /git-applypatch.sh
parent56d33b1105e63590577672de9afb920f6e7fd22c (diff)
downloadgit-c2d5036de5c2e21fb736002ae5b385ceb7c6b23b.zip
git-c2d5036de5c2e21fb736002ae5b385ceb7c6b23b.tar.gz
git-c2d5036de5c2e21fb736002ae5b385ceb7c6b23b.tar.bz2
git-apply: retire unused/unimplemented --no-merge flag.
The original plan was to do 3-way merge between local working tree, index and the patch being applied, but that was never implemented. Retire the flag to control its behaviour. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-applypatch.sh')
0 files changed, 0 insertions, 0 deletions