my git cheatsheet

Just to keep a note about some frequently used git commands:

Push an existing project to a remote repository

# in your remote repo
git init --bare my-project.git

# in your local project folder
git init
git add .
git commit -m 'initial commit'
git remote add origin git@your-git-host:gitRepot/my-project.git
git push origin master

Compare the difference between two branches

Display commits in branch-X, but not in master(or other branch you want to specify).

• credit

git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative master..branch-X

Squash multiple commits into one

git rebase -i HEAD~3 # 3 is the number of recent commits

The above rebase command will bring up the rebase editor

pick f392171 Added new feature X
pick ba9dd9a Added new elements to page design
pick df71a27 Updated CSS for new elements

Change your file to this:

pick f392171 Added new feature X
squash ba9dd9a Added new elements to page design
squash df71a27 Updated CSS for new elements

Once it’s done, exit the editor and push the changes to the remote branch, using -f only when you are sure you are the only one who is making the change.

.gitattributes

.gitattributes can be used to control line endings. But it should be used carefully. If it’s not configured properly, it could result in some mysterious behavior and might drive you crazy.

Never use * eol=lf alone! If you have binary files to checkin, it will process them as well and can damage the file.

* eol=lf
*.jar -text

Here is an example from github:

# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary

https://help.github.com/en/articles/configuring-git-to-handle-line-endings

References

• How to configure multiple github accounts with ssh keys on macOS