GIT useful commands

git-useful-commands.md

Revision selection

1. https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection

Compare branches

1. Get all branches not merged to master git branch --no-merged master (see)

2. Get all branches merged to master git branch --merged (see)

3. Remove local branches that have gone remotes git fetch --prune && git branch -lvv | cut -c3- | awk '/: gone]/ {print $1}' | xargs git branch -d (see)

   1. git fetch -p && for branch in $(git branch -vv | grep ': gone]' | awk '{print $1}'); do git branch -D $branch; done (see)

4. List of all revisions in branch git rev-list master..aaa (see)

   1. For grandchildren git rev-list ^master ^aaa bbb ([see](https://stackoverflow.com/questions/15589862/how-to-find-all-unmerged-

5. List of revision not merged to master

   1. git rev-list aaa --not master --no-merges (see)
   2. or git rev-list --first-parent --no-merges master..aaa (see)
      1. ... --reverse commits-in-master-grouped-by-the-branches-they-were-cre))

6. List of revisions to merge from master git rev-list master --not aaa (see).

7. Get first accessor and application (see)

   git config --global alias.oldest-ancestor '!zsh -c '\''diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "${1:-master}") <(git rev-list --first-parent "${2:-HEAD}") | head -1'\'' -'

   1. All changes in branch

      git config --global alias.branchdiff '!sh -c "git diff `git oldest-ancestor`.."'
      

   2. Al commits in branch

      git config --global alias.branchlog '!sh -c "git log `git oldest-ancestor`.."'
      

Log

1. Graph log (see)

   log --all --decorate --oneline --graph
   

2. How to get commits by users

   git shortlog
   # or
   git shortlog -sne

3. How to count changed lines before commit:

   git diff --numstat
   #or 
   git diff --shortstat

4. Get commit hash prior another one git rev-list --parents -n 1 42de6ad | awk -F ' ' '{print $2}'
5. Get branches contain specific commit git branch -a --contains 42de6ad
6. Nearest parent branch

   git log --pretty=format:'%D' HEAD^ | grep 'origin/' | head -n1 | sed 's@origin/@@' | sed 's@,.*@@'
   

7. Current branch to variable

   test=`git branch --show-current`
   

Update using pull / rebase

1. Pull master if curent branch is aaa git pull origin master

2. Rebase all local commits on the top of master. To be exact move base commit and that apply all local commits on the top of the last one (see)

   ⚠️ do not use it if you have pushed commits

   git pull --rebase origin master
   

Merge

1. Prepare merge request

   git config --global alias.tomerge '!currentBranch=\`git branch --show-current\`; tempBranch="${currentBranch}_tomerge"; git checkout -b "$tempBranch"; git checkout main; git rebase; git checkout $tempBranch; git rebase main; git reset $(git merge-base main $(git rev-parse --abbrev-ref HEAD)); git add -A'
   

   (see)

Cancel

1. Cancel merge

Change commits

1. Change commit author

rln -> ln

find . -name "*" -exec git ls-files -s {} \;

https://stackoverflow.com/questions/38495989/how-to-get-git-parent-branch-name-from-current-branch
https://stackoverflow.com/questions/2706797/finding-what-branch-a-git-commit-came-from/40319739
https://stackoverflow.com/questions/43535132/given-a-commit-id-how-to-determine-if-current-branch-contains-the-commit

https://www.jetbrains.com/help/objc/apply-changes-from-one-branch-to-another.html

prepare commit to merge request (see)

1. calculate base branch

git config --global alias.tomerge '!currentBranch=`git branch --show-current`; tempBranch="${currentBranch}_tomerge"; git checkout -b "$tempBranch"; git checkout main; git rebase; git checkout $tempBranch; git rebase main; git reset $(git merge-base main $(git rev-parse --abbrev-ref HEAD)); git add -A'

currentBranch=`git branch --show-current`
tempBranch=${currentBranch}_tomerge
git checkout -b $tempBranch
## git fetch origin main:main?
git checkout main
git rebase
git checkout $tempBranch
git rebase main
git reset $(git merge-base main $(git rev-parse --abbrev-ref HEAD)) 
git add -A