summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-23 14:17:53 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-23 14:17:53 +0900
commita37b73e9bb8b830a679abad23eff9b0949e07416 (patch)
treecb216dd06309c09a1f3bce764fd11faab4ad44a8 /git-mergetool.sh
parentMerge branch 'er/fast-import-dump-refs-on-checkpoint' into maint (diff)
parenttravis-ci: fix "skip_branch_tip_with_tag()" string comparison (diff)
downloadtgif-a37b73e9bb8b830a679abad23eff9b0949e07416.tar.xz
Merge branch 'ls/travis-scriptify' into maint
The scripts to drive TravisCI has been reorganized and then an optimization to avoid spending cycles on a branch whose tip is tagged has been implemented. * ls/travis-scriptify: travis-ci: fix "skip_branch_tip_with_tag()" string comparison travis: dedent a few scripts that are indented overly deeply travis-ci: skip a branch build if equal tag is present travis-ci: move Travis CI code into dedicated scripts
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions