summaryrefslogtreecommitdiff
path: root/git-gui/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-24 16:23:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-24 16:23:50 -0700
commit7b676b1bb53c936770a07354ec6c6550fb31b421 (patch)
treeee46af290fec7e3bdf30b5759a887928c9a15147 /git-gui/Makefile
parentDocumentation: explain the meaning of "-g" in git-describe output (diff)
parentt3417: Add test cases for "rebase --whitespace=fix" (diff)
downloadtgif-7b676b1bb53c936770a07354ec6c6550fb31b421.tar.xz
Merge branch 'bg/apply-fix-blank-at-eof' into maint
* bg/apply-fix-blank-at-eof: t3417: Add test cases for "rebase --whitespace=fix" t4124: Add additional tests of --whitespace=fix apply: Allow blank context lines to match beyond EOF apply: Remove the quick rejection test apply: Don't unnecessarily update line lengths in the preimage
Diffstat (limited to 'git-gui/Makefile')
0 files changed, 0 insertions, 0 deletions