| commit | f9189cf8f2427b10a40b5b3e530e2c893bc64ae9 | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Wed, 21 May 2008 11:32:16 +0000 (21 12:32 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 May 2008 06:05:11 +0000 (22 23:05 -0700) | ||
| tree | 613f4df13029d7c2b0f54a290969f79858438dbe | treesnapshot (tar.gz zip) |
| parent | dee2775a29440ca8a52bb5bd09a6de6cd29f69cc | commitdiff |
pull --rebase: exit early when the working directory is dirty
When rebasing fails during "pull --rebase", you cannot just clean up the
working directory and call "pull --rebase" again, since the remote branch
was already fetched.
Therefore, die early when the working directory is dirty.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When rebasing fails during "pull --rebase", you cannot just clean up the
working directory and call "pull --rebase" again, since the remote branch
was already fetched.
Therefore, die early when the working directory is dirty.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-pull.sh | diffblobblamehistory | |
| t/t5520-pull.sh | diffblobblamehistory |