From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> These patches add an '--autostage' option (and corresponding config variable) to 'rebase --continue' that will stage any unstaged changes before continuing. This saves the user having to type 'git add' before running 'git rebase --continue'. Phillip Wood (5): rebase --continue: add --autostage to stage unstaged changes rebase -i: improve --continue --autostage Unify rebase amend message when HEAD has changed Add tests for rebase --continue --autostage Add rebase.continue.autostage config setting git-rebase--am.sh | 1 + git-rebase--interactive.sh | 111 ++++++++++++++++++++++++++++++++---------- git-rebase--merge.sh | 1 + git-rebase.sh | 76 ++++++++++++++++++++++++++--- sequencer.c | 22 +++++++-- t/t3404-rebase-interactive.sh | 2 +- t/t3418-rebase-continue.sh | 50 ++++++++++++++++++- 7 files changed, 222 insertions(+), 41 deletions(-) -- 2.13.3
