git.md

Git tips

Config

• git config --global credential.helper "cache --timeout=14400" --replace-all - сохранит креды на 4 часа

Cherry-pick

• git cherry-pick <commit> - moves commit to current branch

Search some code in history

• git log -S "MyMethod" -- path/to/file/or/dir - will show commits where that code was updated/deleted

Remotes

1. In github you can't fork from any commit - only from current commit of master However, you can easily rollback to any commit in already forked repo:

• fork master
• git clone
• git reset --hard <commit>
• git push -f origin master

2. Change remote

git remote -v
git remote set-url origin https://github.com/USERNAME/REPOSITORY.git

3. Change remote, that was cloned using https to ssh

git remote -v
git remote set-url origin <clone ssh link>
git remote -v
# now every push or fetch will be userd via ssh

Tools

1. Meld - out of the box nice gui for watching diffs, merge and so on

Revert

• !!! git revert работает не так, как ты ожидаешь

Если ещё не запушил, и надо "перекоммитить" последний коммит:

(подробнее - https://stackoverflow.com/questions/927358/how-do-i-undo-the-most-recent-local-commits-in-git)
- git reset HEAD~
- git add
- git commit -c ORIG_HEAD

Универсальный вариант

• git checkout <последний нормальный коммит>
• git chechout -b <new branch>
• git cherry-pick -n <commit> - по одному черри-пикать коммиты (начиная с самого раннего). -n - это значит не коммитить. Можно будет закоммитить "как надо"

unstage

• git reset HEAD -- path/to/file - will remove file from staging (no files deleted)

.gitignore

• set * to ignore all, then explicitly add files with !.gitngnore and so on
• hint! to add dotfolders you need to type .i3 in root .gitignore, and add .i3/.gitignore with !* content

See also

• https://jonas.github.io/tig/doc/manual.html - very nice TUI for git

credential-helper

• ``
• echo -ne 'username=username\nprotocol=https\nhost=github.com\n' | git credential-cache get - prints saved creds (when git config --global credential.helper "cache --timeout=3600" is used)
• git credential-cache exit - forgets all saved passwords before to expires (new passwords will be saved)

rebase

• git rebase -i HEAD~4 - start rebasing last 4 commits https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history

reword

• in first vim text see list of commits; change pick to r to select commits
• in second vim text see list of messages to commits - change them

squash

• in first vim text see list of commits; change pick to s to select commits, which will be melded with the previous one (e.g. pick on first commit, s on every other)
• in second vim text see list of messages to commits - change commits messages

force push

• git push --force origin feature_branch - ! rewrites origin history!

rebase with sign

• to sign one commit (after squash) - git commit -S --amend --no-edit
• to sign multiple commits - git rebase -i branch -> mark all commits "e" -> for every commit git commit -S --amend --no-edit and git rebase --continue
• git log --show-signature -2

rebase on top of master

• let's say you made a PR to master with only commit (all commits are squashed in one)
• master was updated (another PR was merged)
• you want to merge master to your branch and fix conflicts; but you want all your changed to still be in a single commit
• git fetch
• git rebase origin/master
• all your commits will be then applied to origin/master one by one
• let's say there are conflicts in 2 commits
• fix conflicts of first commit
• git add . (or git add conflicting files)
• git rebase --continue
• fix conflicts of second commit
• git add . (or git add conflicting files)
• git rebase --continue
• git push --force origin feature_branch

mics

• you can use token as password when git fetch

multiple ssh keys

• https://www.freecodecamp.org/news/how-to-manage-multiple-ssh-keys/
• tldr - add additional keys like so: ~/.ssh/id_rsa_custom1, id_rsa_custom1.pub; create ~/.ssh/config and add to it:

Host github.com # for git
  HostName github.com
  User mygithublogin
  IdentityFile ~/.ssh/_id_rsa
  IdentitiesOnly yes
 
Host bitbucket-corporate # for git
  HostName bitbucket.org
  User mybitbucketlogin
  IdentityFile ~/.ssh/id_rsa_corp
  IdentitiesOnly yes

Host myserver # for ssh into some server like so `ssh steve.com (instead of ssh steve@steve.com -i ~/.ssh/id_rsa_personal -p 1111)`
  HostName steve.com
  User steve
  Port 1111
  IdentityFile ~/.ssh/id_rsa_personal
  IdentitiesOnly yes