Git
Usage
# set a commit as HEAD
git reset --hard <commit_id>
# create local branch from remote branch
git checkout -b test <name of remote>/test
# force push
git push origin <your_branch_name> --force
# visualize lineage
git log --graph --oneline --all
# compare tips of different branches
git diff branch1..branch2
# ignore whitespace
git diff -w
# squash last N commits
git rebase -i HEAD~N
# Verifies the connectivity and validity of the objects in the database
git fsck
# show staged changes
git diff --cached
# checkout file from another branch
git checkout $REVISION -- $FILENAME
Submodule
# update submodule
git submodule foreach git pull origin master
# remove submodule: https://stackoverflow.com/questions/1260748/how-do-i-remove-a-submodule
git rm <path-to-submodule>
rm -rf .git/modules/<path-to-submodule>
git config --remove-section submodule.<path-to-submodule>.
Recipes
List untracked files
git status --ignored OR git clean -ndX
$ git help clean
git-clean - Remove untracked files from the working tree
-n, --dry-run - Don't actually remove anything, just show what would be done.
-d - Remove untracked directories in addition to untracked files.
-X - Remove only files ignored by Git.
Remove submodule
git rm -r the_submodule
rm -rf .git/modules/the_submodule
get total additions and deletions on a given branch for an given author in git
git log --author=$USER --shortstat $BRANCH | \
awk '/^ [0-9]/ { f += $1; i += $4; d += $6 } \
END { printf("%d files changed, %d insertions(+), %d deletions(-)", f, i, d) }'
Tools
- git-summary - Summarizes multiple git repository status within a directory.
- gource - Software projects are displayed by Gource as an animated tree with the root directory of the project at its centre. Directories appear as branches with files as leaves. Developers can be seen working on the tree at the times they contributed to the project.
Visualize
Notes: use python3.7
docker run \
--rm -v $(pwd):/repo \
felix/gitinspector:0.4.4 \
--format=html \
--timeline=TRUE > stats.html