diff --git a/.gitconfig b/.gitconfig index 20f885a..3116a09 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,73 +1,73 @@ [user] - name = Rodolphe Bréard - email = v.code.ngyvz7vf@what.tf - signingkey = /home/rodolphe/.ssh/id_ed25519.pub + name = Rodolphe Bréard + email = v.code.ngyvz7vf@what.tf + signingkey = /home/rodolphe/.ssh/id_ed25519.pub [core] - editor = vim + editor = vim [push] - default = simple + default = simple [alias] - s = switch - r = restore - df = diff --color-words - br = branch - ci = commit - st = status - unstage = reset HEAD -- - last = log -1 HEAD - undo = reset --soft HEAD^ - amend = commit --amend + s = switch + r = restore + df = diff --color-words + br = branch + ci = commit + st = status + unstage = reset HEAD -- + last = log -1 HEAD + undo = reset --soft HEAD^ + amend = commit --amend - ; ms: merge squash - ; Squash commits from the target branch and merge them into the current branch. - ms = merge --squash + ; ms: merge squash + ; Squash commits from the target branch and merge them into the current branch. + ms = merge --squash - ; - ; http://blogs.atlassian.com/2014/10/advanced-git-aliases/ - ; - ls = log --oneline + ; + ; http://blogs.atlassian.com/2014/10/advanced-git-aliases/ + ; + ls = log --oneline - ; caa: commit amend append - ; Take all uncommitted and un-staged changes currently in the working directory and add them to the previous commit. - caa = commit -a --amend -C HEAD + ; caa: commit amend append + ; Take all uncommitted and un-staged changes currently in the working directory and add them to the previous commit. + caa = commit -a --amend -C HEAD - ; new: see new commits - ; Displays commits created by the last command (typically after a git pull). - new = !sh -c 'git log $1@{1}..$1@{0} "$@"' + ; new: see new commits + ; Displays commits created by the last command (typically after a git pull). + new = !sh -c 'git log $1@{1}..$1@{0} "$@"' [color] - branch = auto - diff = auto - status = auto + branch = auto + diff = auto + status = auto [color "branch"] - current = yellow reverse - local = yellow - remote = green + current = yellow reverse + local = yellow + remote = green [color "diff"] - meta = yellow bold - frag = magenta bold - old = red bold - new = green bold + meta = yellow bold + frag = magenta bold + old = red bold + new = green bold [color "status"] - added = yellow - changed = green - untracked = cyan + added = yellow + changed = green + untracked = cyan [commit] - template = ~/.git_commit_msg.txt - gpgsign = true + template = ~/.git_commit_msg.txt + gpgsign = true [pull] - rebase = false + rebase = false [init] - defaultBranch = main + defaultBranch = main [gpg] - format = ssh + format = ssh