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

fix small typo #310

Merged
merged 1 commit into from
Dec 18, 2014
Merged

fix small typo #310

merged 1 commit into from
Dec 18, 2014

Conversation

dedan
Copy link
Contributor

@dedan dedan commented Nov 18, 2014

No description provided.

@iggyvolz
Copy link

I believe it should be "time to spare", not just "time spare".

@dedan
Copy link
Contributor Author

dedan commented Nov 18, 2014

yes, you are right. I'll change that

@iggyvolz
Copy link

You might want to squash these commits to make them into one small "fix small typo" commit. Run git rebase -i 49b9e79, then change the first word of the second line to "squash" or "s". Now you may pick a message for your squashed commit.

After you do this, you will need run a git push --force to forcibly push the commits to your fork.

@dedan
Copy link
Contributor Author

dedan commented Nov 19, 2014

Hey Iggy,

thanks for that hint. I thought the rebases on already published branches
is frowned upon. I thought it will mess up the pull request. But now I read
about it and you are right. I'll do that later.

stephan

On Tue, Nov 18, 2014 at 9:10 PM, iggyvolz notifications@github.com wrote:

You might want to squash these commits to make them into one small "fix
small typo" commit. Run git rebase -i 49b9e79, then change the first word
of the second line to "squash" or "s". Now you may pick a message for your
squashed commit.

After you do this, you will need run a git push --force to forcibly push
the commits to your fork.


Reply to this email directly or view it on GitHub
https://github.com/maebert/jrnl/pull/310#issuecomment-63536346.

@iggyvolz
Copy link

@dedan: Yes, on a stable branch (such as the master branch maebert's jrnl), you should never rebase. But if you're doing a feature or bugfix branch, rebasing can help the master branch stay neat.

maebert added a commit that referenced this pull request Dec 18, 2014
@maebert maebert merged commit 205269a into jrnl-org:master Dec 18, 2014
@lock
Copy link

lock bot commented May 21, 2020

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot added the 🔒 Outdated label May 21, 2020
@lock lock bot locked as resolved and limited conversation to collaborators May 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🔒 Outdated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants