Collection of useful git commands in daily work

useful-git-cmds.md

List some useful git commands.

Error: Entry '...' not uptodate. Cannot merge.
Solution:

git rm --cached <filename>

---

• Git pull: error: Entry foo not uptodate. Cannot merge - Stack Overflow
  • https://stackoverflow.com/questions/1248029/git-pull-error-entry-foo-not-uptodate-cannot-merge/2833593

Git log to console (no pager),

git --no-pager log --pretty='format:%Cgreen[%h] %Cblue[%ai] %Creset[%an]%C(Red)%d %n %Creset%s %n' -n3

[xxxxxxxx] [2022-02-23 13:00:13 -0800] [author1] (HEAD -> main_12346, tag: 12346, origin/main, origin/HEAD, main)
  [Fix] Fix a bug (#678)

[yyyyyyyy] [2022-02-23 12:22:22 -0800] [author2] (tag: 12345)
  [Enhance] Enhance a feature (#677)

[zzzzzzzz] [2022-02-23 09:09:09 +0100] [author3] (tag: 12344)
  [Add] Add a component (#676)

---

• Git - pretty-formats Documentation
  • https://git-scm.com/docs/pretty-formats

Revert specific files to an old commit

git restore --source=c5f567 file1_to_restore file2_to_restore

Revert to 1 commit before c5f567:

git restore --source=c5f567~1 file1_to_restore file2_to_restore

Use git status to check whether the files are reverted

---

Reset/Drop previous commit(s):

--soft will leave all changed files as "changes to be committed":

git reset --soft HEAD~1

--hard will discard all changes in the working tree and delete all untracked files:

git reset --hard HEAD~1

---

• git - How can I reset or revert a file to a specific revision? - Stack Overflow
  • https://stackoverflow.com/a/57676529
• Git - git-reset Documentation
  • https://git-scm.com/docs/git-reset

Git sync forked repo with original repo

(1) Fork original repo to user repo in the web page

(2) Git clone user repo to local

git clone https://github.com/<user_name>/<repo_name>.git <local_repo_name>

(3) Add original repo to upstream

git remote remove upstream
git remote add upstream https://github.com/<original_owner_name>/<repo_name>.git

(4) Use following command to see info of origin and upstream:

git remote -v

(5) Create local branches from origin

git checkout -f -b main origin/main
git checkout -f -b dev origin/dev

(6) Sync origin (local and remote) with upstream

git fetch upstream
git checkout <branch_name>
git merge upstream/<branch_name>
git push origin <branch_name>

---

• Git Forks and Upstreams: How-to and a cool tip | Atlassian Git Tutorial
  • https://www.atlassian.com/git/tutorials/git-forks-and-upstreams
• Syncing a fork - GitHub Docs:
  • https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

Git rebase to target branch, and use target's changes if conflicts (i.e., files both modified in two branches).

git rebase <target-branch> -X theirs

Else use ours:

git rebase <target-branch> -X ours

---

• Resolve Git merge conflicts in favor of their changes during a pull - Stack Overflow

  • https://stackoverflow.com/a/10697551

• Git - git-rebase Documentation

  • https://git-scm.com/docs/git-rebase

Git drop some commits in the branch:

git rebase -i HEAD~N

The ~N means rebase the last N commits (N must be a number, for example HEAD~10).
Then, you can edit the file that Git presents to you to delete the offending commit.
On saving that file, Git will then rewrite all the following commits as if the one you deleted didn't exist.

Use push -f to force the push and replace the remote branch with your local one.

---

• git - How do I delete a commit from a branch? - Stack Overflow
  • https://stackoverflow.com/a/1338758

Git pull force overwrite local changes:

git fetch --all
# git branch backup-changes
git reset --hard origin/main

---

• version control - How do I force "git pull" to overwrite local files? - Stack Overflow
  • https://stackoverflow.com/a/8888015/8328786

Auto complete git branch names in (t)csh

Download git-completion.bash and git-completion.tcsh:

curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash -o ~/.git-completion.bash
curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.tcsh -o ~/.git-completion.tcsh

Add following lines to ~/.cshrc:

set autolist=ambiguous
source ~/.git-completion.tcsh

---

• terminal - git auto-complete for branches at the command line? - Ask Different
  • https://apple.stackexchange.com/questions/55875/git-auto-complete-for-branches-at-the-command-line
• git/git-completion.tcsh at master · git/git
  • https://github.com/git/git/blob/master/contrib/completion/git-completion.tcsh
• git/git-completion.bash at master · git/git
  • https://github.com/git/git/blob/master/contrib/completion/git-completion.bash

Gist remove/squash some revisions:

References:

• git - How to delete a specific revision of a github gist? - Stack Overflow
  • https://stackoverflow.com/a/13722336/8328786

NOTE: Do not forget to remove the # after rebase in order to add a valid commit message after squashing

Git change author of previous commit:

git commit --amend --author="Author Name <[email protected]>" --no-edit

References:

• git - How to change the commit author for a single commit? - Stack Overflow
  • https://stackoverflow.com/questions/3042437/how-to-change-the-commit-author-for-a-single-commit

Git update submodules to latest commit:

git submodule foreach git pull

or submodule is in detached state:

git submodule foreach git pull origin main # (master)

References:

• Update Git submodule to latest commit on origin - Stack Overflow
  • https://stackoverflow.com/questions/5828324/update-git-submodule-to-latest-commit-on-origin

Git pull submodule:

git submodule update --init --recursive  # (First time)
git submodule update --recursive --remote

References:

• Pull latest changes for all git submodules - Stack Overflow
  • https://stackoverflow.com/a/1032653/8328786

Remove contributor from GitHub repo page:

• On GitHub web page, change a branch name (e.g., main --> main1).
  • It updates the contributor list on the GitHub repo dashboard.
• Then change it back (main1 --> main).

References:

• git - Removing contributor from github.com? - Stack Overflow
  • https://stackoverflow.com/questions/44563131/removing-contributor-from-github-com