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.

Sign up for GitHub

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

Added interactive rebase instructions. #9

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added interactive rebase instructions. #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion Git.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,20 @@ git commit
git push -ff origin MYBRANCH
```

###Alternative for squashing using interactive rebase
```
git checkout MYBRANCH
git rebase -i master

# You will be taken to an editor listing commits.
# Leave the first commit as is and change all others
# to "fixup" or "f". Exit the editor. You will be taken
# to another editor. Change the commit message to what you want
# the merged commit message to be and exit the editor.

git push origin MYBRANCH --force
```

Helpful practices
----------------------
###See previous commit
Expand Down Expand Up @@ -149,4 +163,4 @@ git log -Ssomefunct --oneline
###History of changes for code
```
git log -L :somefunct:somefile.py
```
```