Git Survival Kit - Part 2

Farhad F. — Tue, 11 Jan 2022 03:12:30 +0000

This is the second part of my git survival kit series, a collection of easy-to-learn and vital commands for day-to-day git operations for everyone. Even if you're new to git, knowing these commands will definitely help you become more productive and solve your mistakes.

1. display the list of branches

local branches: git branch

remote branches: git branch -r

2. display current repository configurations
git config -l

3. delete tag from the local repository
git tag --delete tagname

4. delete tag from the remote repository
git push --delete origin tagname

5. see which commit a tag points to
git rev-parse tagname

6. revert branch history to a specific tag, discarding all changes after the tag
git reset --hard tagname

7. revert branch history to a specific tag, keeping all changes after the tag in the staging area
git reset --soft tagname

8. filtering history of commits in date ranges using since and until options
git log --since='yesterday'
and
git log --since="1 week ago" --until="yesterday"

9. showing commit history with summary of changes made in each commit
git whatchanged

also, the since and until options can be used to filter history

git whatchanged --since='2 weeks ago' --until='2 days ago'

10. see the changes to a file in a commit
git show commit_hash -- file_name

Git Survival Kit - Part 1

Farhad F. — Mon, 10 Jan 2022 00:42:36 +0000

Read Part 2

In the life of every developer regardless of experience level, comes a day when she needs to get out of or resolve an awkward git situation. In this series, I'm going to share some simple yet life-saving git commands that are both easy to learn and vital to your day-to-day version control ops.

1. undo the first commit ( assuming there is only one commit in the history)
git update-ref -d HEAD

2. undo the last (n) commits and return the changed files to staging area
git reset --soft HEAD~n

3. print the number of commits on all branches grouped by authors
git shortlog -s -n --all

p.s - yes Jayson, that's how I found out that I've done more commits than you. Take that.

4. undo a pushed commit in the remote repository, on master branch
git push origin +{commit-hash}^:master

5. See all the upstream repository urls, where you're 'pushing' your code.
git remote -v

6. remove a file from the staging area
git reset <file_name>

7. remove all files inside a folder from the staging area
git reset <folder_name>/

8. ignore changes to already tracked files
git update-index --assume-unchanged <file>

another alternative :

git update-index --skip-worktree <file>

9. undo last tip: start tracking files again
git update-index --no-assume-unchanged [<file> ...]

10. show list of tags, sorted by date descendingly
git tag --sort=-creatordate

DEV Community: Farhad F.

Git Survival Kit - Part 2

Git Survival Kit - Part 1