summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-02 18:13:44 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-02 18:13:44 (GMT)
commitf9d72413bcbf33ced45f12e17ef156abd73963f6 (patch)
tree86dba3737d5e0b583d7438c927db9e95b632ab68 /debian
parent23822a355de674f1d1321ad7e112f0fe40124aca (diff)
downloadgit-f9d72413bcbf33ced45f12e17ef156abd73963f6.zip
git-f9d72413bcbf33ced45f12e17ef156abd73963f6.tar.gz
git-f9d72413bcbf33ced45f12e17ef156abd73963f6.tar.bz2
Handle really trivial case inside git-merge.
Using Linus' --trivial option, this handles really trivial case inside git-merge itself, without using any strategy modules. A 'really trivial case' is: - we are merging one branch into the current branch; - there is only one merge base between the branches; - there is no file-level merge required. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions