summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-01-12 15:16:54 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-01-12 15:16:54 -0800
commit72d25911eb6adc450aabb741cb911bf6aa89a322 (patch)
tree4b5f058042658caa86b53a7c058b82999def082b /contrib/examples/git-resolve.sh
parentMerge branch 'sb/submodule-parallel-fetch' (diff)
parentblame: add support for --[no-]progress option (diff)
downloadtgif-72d25911eb6adc450aabb741cb911bf6aa89a322.tar.xz
Merge branch 'ea/blame-progress'
"git blame" learned to produce the progress eye-candy when it takes too much time before emitting the first line of the result. * ea/blame-progress: blame: add support for --[no-]progress option
Diffstat (limited to 'contrib/examples/git-resolve.sh')
0 files changed, 0 insertions, 0 deletions