aboutsummaryrefslogtreecommitdiff
path: root/builtin/show-branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:35 -0700
committerJunio C Hamano <gitster@pobox.com>2010-03-20 11:29:35 -0700
commit31fbae0f813b47801ee79a464a8257346a5f8f2c (patch)
treec592774728ed75406480d5d21fa4fdf61ef1cf61 /builtin/show-branch.c
parent2bb76e139e3ab503992d227103f2bbb806b1f04b (diff)
parent59f5ced65b46370a121916593cce7fcd210a15df (diff)
downloadgit-31fbae0f813b47801ee79a464a8257346a5f8f2c.tar.gz
git-31fbae0f813b47801ee79a464a8257346a5f8f2c.tar.xz
Merge branch 'bg/apply-fix-blank-at-eof'
* 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 'builtin/show-branch.c')
0 files changed, 0 insertions, 0 deletions