Flashcards
Git commands
Cards in this deck (3)
- 1Tag a releasegit tag -a 4.29 -m "20151110_EX"
- 2Is there a way to do a git pull that ignores any local file changes without blowing the directory away and performing a git clone?git reset --hard
git pull - 3What is 'No Fast Forward'The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature. […]
Yes, it will create a few more (empty) commit objects, but the gain is much bigger that that cost. Unfortunately, I have not found a way to make --no-ff the default behavior of git merge yet, but it really should be.
Information
- Description
- Git Flashcards on Git commands, created by Ben Parish on 11/11/2015.
- Created by
- Ben Parish
- Views
- 0
- Rating