Cheatsheet

📋 Most Useful Git Commands

Description	Command
Fetch changes from the remote and reapply local commits on top	git pull --rebase
Undo the latest commit, keeping changes staged	git reset HEAD~1
Modify the message of a specific commit, where n represents the number of commits from the current commit (HEAD)	git rebase -i HEAD~n Replace pick with reword for the desired commit, save, and exit. Then update the commit message.
Squash the last 3 commits into one interactive session	git rebase -i HEAD~3 Edit "pick" to "squash" for commits 2 and 3. If you mark one or more lines as "squash", they will be combined with the one above. pick 2598ef1 fix: password squash 8ff64e1 fix: modify public port squash 5a96fa8 fix: version gitlab-ci Edit the squash commit and force push to remote git push origin ${branch} -f

By Category

🔧 Setup

Description	Command
Set your name for Git	git config --global user.name "Your Name"
Set your email for Git	git config --global user.email "[email protected]"
Check your Git configuration	git config --list

---

📂 Repository Management

Description	Command
Initialize a new Git repository	git init
Clone an existing repository	git clone <repo_url>
Show the current status of the repository	git status
View commit history	git log
View concise commit history	git log --oneline

---

🧹 Clean Up

Description	Command
Remove untracked files	git clean -f
Remove unused remote-tracking branches	git prune
Optimize the repository	git gc

---

✏️ Staging and Committing

Description	Command
Stage a specific file	git add <file>
Stage all changes	git add .
Commit staged changes with a message	git commit -m "Commit message"
Edit the last commit message	git commit --amend -m "Updated message"

---

🌐 Branch Management

Description	Command
List all branches	git branch
Create a new branch	git branch <branch_name>
Switch to an existing branch	git checkout <branch_name>
Create and switch to a new branch	git checkout -b <branch_name>
Merge a branch into the current one	git merge <branch_name>
Delete a branch	git branch -d <branch_name>

---

🚑 Undoing Changes

Description	Command
Discard changes in a working file	git restore <file>
Unstage a file	git reset <file>
Reset all changes to the last commit	git reset --hard HEAD
Revert a specific commit	git revert <commit_hash>

---

🕵️ Viewing Differences

Description	Command
Show unstaged changes	git diff
Show staged changes	git diff --staged
Compare two branches	git diff <branch_1> <branch_2>

---

🔗 Remote Repositories

Description	Command
Link a remote repository	git remote add origin <repo_url>
View linked remote repositories	git remote -v
Remove a remote link	git remote remove origin

---

🛠️ Advanced

Description	Command
Stash changes without committing	git stash
List stashed changes	git stash list
Reapply stashed changes	git stash apply
Apply a specific commit to the current branch	git cherry-pick <commit_hash>
Reapply commits on top of another branch	git rebase <branch_name>

---

🌟 Tips

• Use a .gitignore file to exclude files from being tracked.
• Use git bisect to identify the commit that introduced a bug.
• Combine git log with options like --graph or --decorate for a more visual history.

Bonus

Configure SSH key to secure connection

1. Generate public/private keys

ssh-keygen -t ed25519 -C "[email protected]"

2. Edit ~/.ssh/config

# git clone [email protected]:username/myrepo
Host github.com
  AddKeysToAgent yes
  UseKeychain yes
  IdentityFile ~/.ssh/id_ed25519

# If you have multiple user, configure like below
# git clone [email protected]:username/myrepo
Host github.com-username
  AddKeysToAgent yes
  UseKeychain yes
  IdentityFile ~/.ssh/id_ed22519_dedsxc

# git clone [email protected]:username/myrepo
Host gitlab.local
  Port 2222
  AddKeysToAgent yes
  UseKeychain yes
  IdentityFile ~/.ssh/gitlab_ed25519

3. In Github or Gitlab, add the generated public key

Sign commit with GPG

1. Import public gpg keys in Git remote server (Github, Gitlab etc.)

# Create GPG public & private key
gpg --full-gen-key

# Get GPG private key
gpg --list-secret-keys --keyid-format=long

# Output example:
## ------------------------------------
## sec   rsa4096/XXXXXXXXXXXXXXXX 2016-03-10 [expires: 2017-03-10]
## uid                          Hubot <[email protected]>
## ssb   rsa4096/XXXXXXXXXXXXXXXX 2016-03-10

# Export public gpg key associate to the sec ID 
## sec   rsa4096/XXXXXXXXXXXXXXXX
gpg --armor --export XXXXXXXXXXXXXXXX

2. Set private key in git client

# Set the primary private key 
git config --global user.signingkey XXXXXXXXXXXXXXXX

TIP

Set a second private key by adding ! in the end git config --global user.signingkey XXXXXXXXXXXXXXXX!

3. Configure gpg to sign all commit by default

git config --global commit.gpgsign true

4. Configure gpg to sign 1 commit

git commit -S -m "My commit message"

Configure git for child folders

If you have multiple Git repositories with different users, you can configure each repository or folder to use a specific GPG key and user.

1. Create .gitconfig_include file in ~/topLevelFolder1/.gitconfig_include. The content of .gitconfig_include will be like this:

[commit]
        gpgsign = true
[user]
        signingkey = <PRIVATE_KEY_ID>
        name = Username
        email = [email protected]

1. In ~/.gitconfig, add the following in the end of the file:

[includeIf "gitdir:~/toplevelFolder1/"]
    path = ~/topLevelFolder1/.gitconfig_include

Now all git project located in ~/topLevelFolder1/ will use .gitconfig_include configuration.

Related issue in StackOverflow.