Re: [manifest] Chaals patch 1 (#416)

(I'm assuming your are doing this from the command line, if not... it's ok, just stop and I can try to do it fix it.... otherwise...)

Read the instructions first all the way through, specially if you've never done a rebase before. Your text editor will pop up a few times, which you might not be expecting. It's normal :)

The following will open up your text editor: 
```
git rebase -i HEAD~2
```
There you will see:

```git
pick commithash more work...
pick commithash oops...
```

change the second "pick" to "f" and the first to "r", like so (example only, keep the commit hash you have!!). The will tell git that the second commit is a "fixup" of the first, and that you want to rewrite the commit message for the first commit. So, it should now look like this: 

```git
r commithash more work...
f commithash oops...
```

Save, close your editor. Your editor will open up again! But this time you will "more work...". Rewrite the message to better describe the change. Save and quit your editor.

Now, finally, do: 
```
git push -f  
```



---
Reply to this email directly or view it on GitHub:
https://github.com/w3c/manifest/pull/416#issuecomment-159461620