Merge branch 'hs/rebase-continue-edit' into seen

Support for skipping the editor when continuing a rebase after conflict resolution has been added with the '--no-edit' option, and forcing it with '--edit'. A new configuration variable 'rebase.noEdit' can be used to set the default behavior. * hs/rebase-continue-edit: rebase: add --[no-]edit to --continue