[PATCH v3 0/7] rebase.autostash completed
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- May 12, 2013, 11:56 UTC
- Message-ID
- <1368359801-28121-1-git-send-email-artagnon@gmail.com>
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