From 82197f07c7ead84d120fc17b9908c040401d2a8c Mon Sep 17 00:00:00 2001 From: Sonia Hamilton Date: Mon, 11 Jul 2011 10:29:36 +1000 Subject: [PATCH] Added more details to rebasing - cloning, --abort --- en/history.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/en/history.txt b/en/history.txt index 8c38b49..b047486 100644 --- a/en/history.txt +++ b/en/history.txt @@ -72,6 +72,13 @@ and even create new commits that belong here. Once you're pleased with the Git replays commits until the next *edit*, or to the present if none remain. +If you're going to do a complicated rebase and you're worried you might "do +something bad", you can make a local clone of your repository (see section 3.8 +Light-Speed Multitask) and practice on that. Or, if you've started a rebase +and you've messed things up, you can cancel the rebase with: + + $ git rebase --abort + So commit early and commit often: you can tidy up later with rebase. === Local Changes Last === -- 2.11.4.GIT