Git

2022-10-04

Git is one of those tools that I have been using for the past 4-5 years on a daily basis, very very good tool. Below I share some git commands and aliases ...etc, that I've collected over the years.

Aliases:

l = log
how many times do you type git log?
logs = log --pickaxe-all -p -S
This is useful when searching in a repo's commit log for a line of code (verbatim), it shows all the commits where a string of text appears; the -p option makes it show the diff along with the commit message, very good for searching in e.g. less (or whatever pager you use); for what --pickaxe-all does, have a look at the documentation
logg = log --pickaxe-all -p -G
The same as the previous one but uses "-G" (instead of "-S"), which takes a regular expression
rei = rebase --interactive
rec = rebase --continue
cot = checkout -t origin/master -b
Creates a new branch, that tracks the remote origin/master branch, and switches to that new branch, for example git cot blahbleh
cotqt = checkout -t origin/dev -b
The same as the previous one but for Qt repos, they use "dev" instead of "master"...
one-long = log --pretty=format:\"%Cblue%H %<(20,trunc)%Cgreen%an%Creset %Cred%s%Creset\"
Shows git log of a repo, one line per commit:
fd2a2f2806064e71c4e64c80a361bc4b2ef64bd2 John Foo De-duplicate some code
See the documentation for more info.
lbr = log -p origin/master..
Shows all the commits in the current branch (i.e. ones at the top that aren't in master yet); again "-p" makes it show the diff along with the commit message, remove it if you want to see commit messages only
g =!git gui & disown
"& disown", at least with BASH, means send it to the background, and detach it from this terminal, i.e. the GUI app won't be closed when you close the terminal

Custom Git Commands:

Some other commands are too big for an alias, so it's easier to use a git script, basically create a shell script somewhere in your PATH, make it executable and name it git-command_name (where command_name is the name of the command you want use e.g. git-history, you can then use git history like any other git command).

git-history:
```
#!/usr/bin/bash
git reflog "$@" | grep "checkout:" | perl -p -e 's@.+checkout: moving from ([^ ]+).+@$1@' | grep -v master | uniq | head -n 20
```
Prints a list of the branch names that you have checked out / switched to/from, in chronological order; useful when you have many local branches and can't remember the name of one of the recent ones you've been working on. (I omit "master", because I don't have trouble remembering the name of that one).
git-dadd:
```
#!/usr/bin/bash
git diff --name-only --diff-filter=U | xargs git add
```
When doing an interactive rebase and after resolving conflicts, you have to `git add` the files that had conflicts, this command does exactly that.
git-copy:
```
#!/usr/bin/bash
newName=$(git branch --show-current)-2
git branch --copy $newName
```
Creates a copy of the current branch, named current-branch-name-2, basically creating a backup copy in case whatever changes I am about to attempt doing don't work out.