37 lines
1.1 KiB
Text
37 lines
1.1 KiB
Text
|
[alias]
|
||
|
br = branch
|
||
|
cm = commit
|
||
|
co = checkout
|
||
|
df = diff
|
||
|
gr = log --all --graph --decorate --format=format:'%C(bold "#62ccff")%h%C(reset) %C(bold "#fa9c43")(%ai)%C(reset) %C(auto)%d%C(reset)%n%C(italic "#929292")%an:%C(reset) %C("#ffffff")%s%C(reset)%n'
|
||
|
# mr allows you to checkout a merge request locally.
|
||
|
# $1 is the name of the remote
|
||
|
# $2 is the ID of the merge request
|
||
|
# e.g. git mr origin 3
|
||
|
# e.g. git mr upstream 5
|
||
|
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
|
||
|
pl = pull
|
||
|
ps = push
|
||
|
sr = reset --soft
|
||
|
st = status
|
||
|
up = !sh -c 'git checkout $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') && git fetch --all && git pull origin $(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')'
|
||
|
[commit]
|
||
|
gpgsign = true
|
||
|
template = $gitmessage_output
|
||
|
[core]
|
||
|
excludesFile = $gitignore_output
|
||
|
[diff]
|
||
|
tool = vimdiff
|
||
|
[fetch]
|
||
|
prune = true
|
||
|
[gpg]
|
||
|
program = gpg2
|
||
|
[pull]
|
||
|
rebase = false
|
||
|
[user]
|
||
|
email = $git_user_email
|
||
|
name = $git_user_name
|
||
|
signingkey = $git_user_signingkey
|
||
|
[init]
|
||
|
defaultBranch = main
|