summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-05-10 02:22:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-10 02:22:25 (GMT)
commitd1802851b0c112a065b43e3f83d631f867b7e1ce (patch)
treea2916e2e9cd501f87c85dd0c37294fed4e199bed /Documentation/git-merge.txt
parent28cc4ab4224164971a523e8a6c222b5ab2bae27d (diff)
downloadgit-d1802851b0c112a065b43e3f83d631f867b7e1ce.zip
git-d1802851b0c112a065b43e3f83d631f867b7e1ce.tar.gz
git-d1802851b0c112a065b43e3f83d631f867b7e1ce.tar.bz2
revert/cherry-pick: use aggressive merge.
After doing an in-index 3-way merge, we always do the stock "merge-index merge-one-file" without doing anything fancy; use of --aggressive helps performance quite a bit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions