diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2013-06-15 18:43:26 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-17 11:43:24 -0700 |
| commit | 20351bb06bf4d32ef3d1a6849d01636f6593339f (patch) | |
| tree | fc2a9dfa4f36024319ab6497c05a74b27f50ca5c /git-sh-setup.sh | |
| parent | stash: introduce 'git stash store' (diff) | |
| download | tgif-20351bb06bf4d32ef3d1a6849d01636f6593339f.tar.xz | |
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>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions