Merge branch 'js/builtin-rebase-perf-fix'
commitbb6dd0ecad3561985ad91b06c37fa9d62e718db9
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18 18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:55 +0000 (18 18:23 +0900)
treea88dc5b333918b89e1865a04e100c40b2647cd93
parent5d90463e8cb03e4d13cb6605b7c971c652c287ee
parentbac2a1e36ffd7ae8b62e1ba708b64979c0f10ee8
Merge branch 'js/builtin-rebase-perf-fix'

Code clean-up with correction to make the reimplemented "git
rebase" a more faithful rewrite of the original, which also regains
performance.

* js/builtin-rebase-perf-fix:
  built-in rebase: reinstate `checkout -q` behavior where appropriate
  rebase: prepare reset_head() for more flags
  rebase: consolidate clean-up code before leaving reset_head()
builtin/rebase.c