From: Junio C Hamano Date: Tue, 11 Jun 2013 20:31:28 +0000 (-0700) Subject: Merge branch 'rr/rebase-autostash' X-Git-Tag: v1.8.4-rc0~178 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45acb7592825b1faa59ea09247bb88b8e91849e3;p=thirdparty%2Fgit.git Merge branch 'rr/rebase-autostash' * rr/rebase-autostash: rebase: implement --[no-]autostash and rebase.autostash rebase --merge: return control to caller, for housekeeping rebase -i: return control to caller, for housekeeping am: return control to caller, for housekeeping rebase: prepare to do generic housekeeping rebase -i: don't error out if $state_dir already exists am: tighten a conditional that checks for $dotest --- 45acb7592825b1faa59ea09247bb88b8e91849e3