Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation Issue: Submit as One Commit #16

Open
nils-werner opened this issue Feb 10, 2015 · 1 comment
Open

Documentation Issue: Submit as One Commit #16

nils-werner opened this issue Feb 10, 2015 · 1 comment

Comments

@nils-werner
Copy link

The order of squash and pick is incorrect:

squash 8ca46ba Initial draft of article
squash 74abb12 Reworking introductory paragraphs
squash 02221a7 Changes to match the Push style guide
pick ddef6dd Completed article for submission to Push

will not work as squashed commits must follow a picked commit:

pick 8ca46ba Initial draft of article
squash 74abb12 Reworking introductory paragraphs
squash 02221a7 Changes to match the Push style guide
squash ddef6dd Completed article for submission to Push

Conversely, the following text:

Change the file so that squash appears next to the commits you wish to squash, leaving pick next to the commit message you intende to preserve (in this case, ddef6dd Completed article...). The top of this example file, then, would look like:

is incorrect, too.

@jrovegno
Copy link

jrovegno commented Mar 8, 2017

@nils-werner You are correct, following the actual article give me the error:
Cannot 'squash' without a previous commit
You can't see the commits and to get back to where you started, you need to put:
$ git rebase --abort

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants