summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-07 13:17:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-07 13:17:31 -0700
commitdc813f664d779330c392500a0f3b4d53893dc7ae (patch)
treeee84fc963a43dfd2e055aa311833c3625bb09a18 /Documentation/howto/revert-a-faulty-merge.txt
parentMerge branch 'js/daemon-test-race-fix' into maint (diff)
parentConsistently use perl from /usr/bin/ for scripts (diff)
downloadtgif-dc813f664d779330c392500a0f3b4d53893dc7ae.tar.xz
Merge branch 'jk/maint-gitweb-test-use-sane-perl' into maint
When using a Perl script on a system where "perl" found on user's $PATH could be ancient or otherwise broken, we allow builders to specify the path to a good copy of Perl with $PERL_PATH. The gitweb test forgot to use that Perl when running its test. By Jeff King (1) and Zbigniew Jędrzejewski-Szmek (1) * jk/maint-gitweb-test-use-sane-perl: Consistently use perl from /usr/bin/ for scripts t/gitweb-lib: use $PERL_PATH to run gitweb
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions