Merge branch 'maint-1.7.7' into maint-1.7.8
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 20:04:48 +0000 (12:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 20:04:48 +0000 (12:04 -0800)
commite521850...fd4aa79632c99293a39dad56bcaa4143
treeaf47d25...7fe7f7ae2ae93899702ab908b6362eedcopy hash to clipboard (tree)
parentc524ceb...2f65e2ad4fc68c9d5b39f6e4b6b5c17bcopy hash to clipboard (diff)
parentd909e07...1c234b28aac77566368c1ee5451a856acopy hash to clipboard (diff)
Documentation/diff-options.txt