projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 56d33b1) | patch
git-apply: retire unused/unimplemented --no-merge flag.
authorJunio C Hamano <junkio@cox.net>
Tue, 4 Oct 2005 05:28:45 +0000 (22:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 5 Oct 2005 00:04:44 +0000 (17:04 -0700)
commitc2d5036de5c2e21fb736002ae5b385ceb7c6b23b
tree79850cb02b25c4045feddaefe408aed22a7101e5tree | snapshot
parent56d33b1105e63590577672de9afb920f6e7fd22ccommit | diff
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>
Documentation/git-apply.txt diff | blob | history
apply.c diff | blob | history
The core git plumbing