]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'sg/rebase-progress' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:19 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:19 +0000 (12:38 -0700)
Use "Erase in Line" CSI sequence that is already used in the editor
support to clear cruft in the progress output.

* sg/rebase-progress:
  progress: use term_clear_line()
  rebase: fix garbled progress display with '-x'
  pager: add a helper function to clear the last line in the terminal
  t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
  t3404: modernize here doc style

1  2 
cache.h
t/t3404-rebase-interactive.sh
t/t5541-http-push-smart.sh

diff --cc cache.h
Simple merge
Simple merge
Simple merge