| commit | 20351bb06bf4d32ef3d1a6849d01636f6593339f | |
| author | Ramkumar Ramachandra <artagnon@gmail.com> | |
| Sat, 15 Jun 2013 13:13:26 +0000 (15 18:43 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Jun 2013 18:43:24 +0000 (17 11:43 -0700) | ||
| tree | fc2a9dfa4f36024319ab6497c05a74b27f50ca5c | treesnapshot (tar.gz zip) |
| parent | bd514cada4bb1a396a58d408c3ec08526a8be742 | commitdiff |
rebase: use 'git stash store' to simplify logic
rebase has no reason to know about the implementation of the stash. In
the case when applying the autostash results in conflicts, replace the
relevant code in finish_rebase () to simply call 'git stash store'.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
rebase has no reason to know about the implementation of the stash. In
the case when applying the autostash results in conflicts, replace the
relevant code in finish_rebase () to simply call 'git stash store'.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase.sh | diffblobblamehistory |