|
|
|
|
|
|
by iamthebest
4707 days ago
|
|
|
Quick recap of the git commands shown in the presentation: git merge master -s <strategy>
git merge master -s recursive -Xpatience
git merge master -s octopus
git merge master -s ours
git diff stash{0}
git --no-pager diff
git stripspace < file
git diff --check
git diff --cached
git merge --abort
git merge -m "message"
git merge --no-commit
git status --ignored
git update-index --assume-unchanged path_to_file
git update-index --no-assume-unchanged path_to_file Also, keep the commit message summary to 50 characters or less and wrap the long description at 72 characters. |
|
|