Minor changes since v2 in response to reviews by Junio and Eric Sunshine. Should be ready to merge soon.
Ramkumar Ramachandra (7): am: tighten a conditional that checks for $dotest rebase -i: don't error out if $state_dir already exists rebase: prepare to do generic housekeeping am: return control to caller, for housekeeping rebase -i: return control to caller, for housekeeping rebase --merge: return control to caller, for housekeeping rebase: implement --[no-]autostash and rebase.autostash Documentation/config.txt | 8 +++ Documentation/git-rebase.txt | 10 +++ git-am.sh | 13 +++- git-rebase--am.sh | 8 +-- git-rebase--interactive.sh | 11 ++-- git-rebase--merge.sh | 5 +- git-rebase.sh | 46 +++++++++++++- t/t3420-rebase-autostash.sh | 148 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 233 insertions(+), 16 deletions(-) create mode 100755 t/t3420-rebase-autostash.sh -- 1.8.3.rc1.51.gd7a04de -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
