# List branches by date
bbd = "for-each-ref --sort=committerdate refs/heads/"

# Print the current branch name
branch-name = "!git rev-parse --abbrev-ref HEAD"

ci = commit
d = diff --color-words
dd = diff --color-words --cached
st = status
co = checkout
br = branch
cp = cherry-pick
ga = annex

# Pull from the upstream repository
pom = "pull origin main"  # or "pull upstream main", depending how you name remotes
fom = "fetch origin main"  # or "pull upstream main", depending

# Email log; useful for grabbing commit messages for pasting into, e.g., GitHub
el = log --pretty=e

# List all remote branches
rbr = "!f() { git branch -r | grep "^[[:space:]]*$1.*" | cut -d '/' -f 2 | sort | uniq | column ; }; f"

# Print log graph
slog = log --oneline --topo-order --graph

# Print log graph with more info
slog2 = log --graph --topo-order --abbrev-commit

# Rebase on fetched origin/master
rb = "!f() { git fetch origin master && git rebase -i origin/master ;}; f"

# New branch X from fetched origin/master
new = "!f() { git fetch origin master && git checkout -b $1 origin/master ;}; f"

# Set upstream branch to X
upstream = "!f() { git branch --set-upstream-to=$1 $(git branch-name) ;}; f"

# Remove branches that have been merged
delete-merged-branches = "!git co master && git branch --no-color --merged | grep -v '\\*' | xargs -n 1 git branch -d"

# Pull PR nr X to branch prX
pullpr = "!f() { git fetch origin pull/$1/head:pr$1 ;}; f"

# Force push without overwriting someone else's work
fp = "push --force-with-lease"

# git diff, but word-by-word instead of line-by-line
wdiff = diff --color-words