diff options
| author | Ben Harris <ben@tilde.team> | 2021-10-10 16:23:34 -0400 |
|---|---|---|
| committer | Ben Harris <ben@tilde.team> | 2021-10-10 16:23:34 -0400 |
| commit | fead404111c3b78a21d9c5fb9ac631eaee244e88 (patch) | |
| tree | 0454f28797781671b54677fc4b816ba6980d2810 /git | |
| parent | 8408a064694a5ef58e8b75ae2b4f489a905ea51d (diff) | |
update fish functions
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index d638717..822788b 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -13,6 +13,9 @@ [pull] ff = only +[diff] + colorMoved = default + [diff "gpg"] textconv = gpg --no-tty --decrypt cachetextconv = false @@ -35,6 +38,7 @@ ap = add --patch local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')} + cv = commit --verbose [rerere] enabled = true [merge] |