mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rr/rebase-autostash-fix'

Browse Source 
* rr/rebase-autostash-fix:
  rebase -i: test "Nothing to do" case with autostash
  rebase -i: handle "Nothing to do" case with autostash
This commit is contained in:
Junio C Hamano
2014-06-16 10:06:57 -07:00
parent 9d1d882e9c ddb5432d23
commit 4a43d4f98a
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase--interactive.sh
View File

@ -1049,14 +1049,14 @@ fi
has_action "$todo" ||
die_abort "Nothing to do"
return 2
cp "$todo" "$todo".backup
git_sequence_editor "$todo" ||
die_abort "Could not execute editor"
has_action "$todo" ||
die_abort "Nothing to do"
return 2
expand_todo_ids