summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-10-10 22:29:02 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-10-10 22:29:02 -0700
commit9861718b305a672f3d17936ea6a6cbd9d9a70059 (patch)
tree7acd0403be58437787131f61e609b744ab43b4ca /Documentation/merge-strategies.txt
parentpaginate git-diff by default (diff)
downloadtgif-9861718b305a672f3d17936ea6a6cbd9d9a70059.tar.xz
git-fetch --update-head-ok typofix
Martin Waitz noticed that one of the case arms had an impossible choice. It turns out that what it was checking was redundant and the typo did not have any effect. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions