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

Add some simpler ways to do the same things #93

Merged
merged 2 commits into from
Feb 22, 2016

Conversation

eush77
Copy link
Contributor

@eush77 eush77 commented Feb 12, 2016

I was too lazy to split it up into different pull requests. Tell me if I should.

Added:

  • git show instead of git diff HEAD@{1} HEAD
  • git commit --amend -m xxx instead of reset&commit
  • removing commits with interactive rebase
  • reset&commit as a replacement for squashing interactive rebase
  • mentioning git rebase --skip

@@ -122,7 +121,7 @@ If you need to change all of history, see the man page for 'git filter-branch'.
In order to remove a file from a commit, do the following:

```sh
$ git checkout HEAD~2 myfile
$ git checkout HEAD^ myfile
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also believe I fixed a bug. This checkout was supposed to reference a previous commit, i.e. HEAD^ or HEAD~1, right?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right!

@RichardLitt
Copy link
Collaborator

Thanks! Left a couple of notes. Otherwise, this LGTM.

RichardLitt added a commit that referenced this pull request Feb 22, 2016
Add some simpler ways to do the same things
@RichardLitt RichardLitt merged commit bc09d52 into k88hudson:master Feb 22, 2016
@RichardLitt
Copy link
Collaborator

Looks great. Thanks!

@eush77 eush77 deleted the additions branch February 22, 2016 16:02
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

Successfully merging this pull request may close these issues.

2 participants