diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-02-18 14:50:04 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-02-18 15:40:53 +0100 |
| commit | 0a3f944791cf93b6abbb544ee0b4df6f2b777351 (patch) | |
| tree | 3b60cd12df5d099949cda3a6cf18c9f93d4a5200 | |
| parent | fa391362e1e607722b874313dec6cdd9db7c62f4 (diff) | |
| download | coreutils-0a3f944791cf93b6abbb544ee0b4df6f2b777351.tar.xz | |
doc: explain how to recover from changes committed to master
* HACKING: A beginner's commit-to-master is so common,
and causes enough confusion, that we describe how to recover.
| -rw-r--r-- | HACKING | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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 |