summaryrefslogtreecommitdiff
path: root/HACKING
diff options
context:
space:
mode:
Diffstat (limited to 'HACKING')
-rw-r--r--HACKING11
1 files changed, 8 insertions, 3 deletions
diff --git a/HACKING b/HACKING
index f6d878f14..bf9a45e04 100644
--- a/HACKING
+++ b/HACKING
@@ -32,9 +32,14 @@ inside your new coreutils/ directory:
If you have made *no* changes:
git pull
-If you *have* made changes and committed them to "master", do this:
- git fetch
- git rebase origin
+If you *have* made changes and mistakenly committed them to "master",
+do the following to put your changes on a private branch, "br", and
+to restore master to its unmodified (relative-to-upstream) state:
+ git checkout -b br
+ git checkout master
+ git reset --hard origin
+
+Then "git pull" should work.
*Before* you commit changes