-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates minor updates chore(renovate): major Update github/codeql-action action to v3 (#341) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> chore: Sync Files - 2023/04/20 -- [bot] synced file(s) with sammcj/automation-repo (#116) Co-authored-by: gha-template-repo-token-generator[bot] <114375963+gha-template-repo-token-generator[bot]@users.noreply.github.com> chore(renovate): major Update major to v5 (major) (#105) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> chore(renovate): major Update major to v4 (major) (#224) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> chore(renovate): major Update peter-evans/create-pull-request action to v6 (#398) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> chore(renovate): patch Update pre-commit/action action to v3.0.1 (#459) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> minor updates chore(renovate): pin Update reviewdog/action-shellcheck digest to 72365a5 (#143) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
- Loading branch information
1 parent
17addea
commit 886b026
Showing
25 changed files
with
875 additions
and
427 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,82 @@ | ||
| [credential] | ||
| helper = store | ||
|
|
||
| [core] | ||
| pager = diff-so-fancy | less --tabs=2 -RFX | ||
| excludesfile = ~/.gitignoreglobal | ||
| ignorecase = true | ||
|
|
||
| [include] | ||
| path = ~/.gitconfig.private | ||
|
|
||
| [url "[email protected]:"] | ||
| insteadOf = https://github.com/ | ||
| [credential] | ||
| helper = store | ||
|
|
||
| # Alises | ||
| [alias] | ||
| init-safe-commit = !~/.safe-commit-hook/install-for-project.sh | ||
| quick-stats = ! /usr/local/bin/git-quick-stats | ||
| prune = fetch --prune | ||
| undo = reset --soft HEAD^ | ||
| glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' | ||
| logline = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | ||
| tree = log --graph --decorate --pretty=oneline --abbrev-commit | ||
| squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} -m \"${1:-Initial commit}\");};f" | ||
| scrub = reset --hard @{upstream} | ||
| recentb = "!r() { refbranch=$1 count=$2; git for-each-ref --sort=-committerdate refs/heads --format='%(refname:short)|%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:-20} | while read line; do branch=$(echo \"$line\" | awk 'BEGIN { FS = \"|\" }; { print $1 }' | tr -d '*'); ahead=$(git rev-list --count \"${refbranch:-origin/master}..${branch}\"); behind=$(git rev-list --count \"${branch}..${refbranch:-origin/master}\"); colorline=$(echo \"$line\" | sed 's/^[^|]*|//'); echo \"$ahead|$behind|$colorline\" | awk -F'|' -vOFS='|' '{$5=substr($5,1,70)}1' ; done | ( echo \"ahead|behind||branch|lastcommit|message|author\\n\" && cat) | column -ts'|';}; r" | ||
| # https://github.com/nedbat/watchgha | ||
| runs = "!f() { \ | ||
| watch_gha_runs \ | ||
| \"$(git remote get-url origin)\" \ | ||
| \"$(git rev-parse --abbrev-ref HEAD)\"; \ | ||
| }; f" | ||
| [include] | ||
| path = ~/.gitconfig.private | ||
|
|
||
| # ********************* | ||
| # Rebase workflow | ||
| mainbranch = "!git remote show origin | sed -n '/HEAD branch/s/.*: //p'" | ||
| synced = "!git pull origin $(git mainbranch) --rebase" | ||
| update = "!git pull origin $(git rev-parse --abbrev-ref HEAD) --rebase" | ||
| squash = "!git rebase -v -i $(git mainbranch)" | ||
| publish = push origin HEAD --force-with-lease | ||
| pub = publish | ||
| ammend = commit --amend | ||
| amend = commit --amend | ||
| # ********************* | ||
| #[url "[email protected]:"] | ||
| # insteadOf = https://github.com/ | ||
|
|
||
| ## Behaviour | ||
| [init] | ||
| defaultBranch = main | ||
| [push] | ||
| default = current | ||
| autoSetupRemote = true | ||
| followtags = true | ||
| [pull] | ||
| rebase = false | ||
| rebase = true | ||
| [rebase] | ||
| autosquash = true | ||
| [diff] | ||
| colorMoved = default | ||
| submodule = log | ||
| [difftool] | ||
| prompt = false | ||
| [merge] | ||
| conflictstyle = diff3 | ||
| tool = delta | ||
| [mergetool] | ||
| prompt = false | ||
| [branch] | ||
| autoSetupMerge = true | ||
|
|
||
| sort = -committerdate | ||
| [mergetool] | ||
| prompt = false | ||
| [filter "lfs"] | ||
| required = true | ||
| clean = git-lfs clean -- %f | ||
| smudge = git-lfs smudge -- %f | ||
| process = git-lfs filter-process | ||
|
|
||
| [tar "tar.xz"] | ||
| command = xz -c | ||
|
|
||
| # Delta diff-tool | ||
| ### DIFF TOOLING ### | ||
| [core] | ||
| pager = delta #--features=interactive #,diff-so-fancy,decorations | ||
| #page = diff-so-fancy | less --tabs=2 -RFX | ||
| [merge] | ||
| conflictstyle = zdiff3 | ||
| tool = delta | ||
|
|
||
| [diff] | ||
| colorMoved = default | ||
| submodule = log | ||
| algorithm = histogram | ||
| tool = delta | ||
| # external = delta | ||
| prompt = false | ||
|
|
||
| [delta] | ||
| side-by-side = false | ||
| side-by-side = true | ||
| navigate = true | ||
| features = decorations | ||
| features = unobtrusive-line-numbers | ||
| features = decorations unobtrusive-line-numbers diff-so-fancy dark | ||
| syntax-theme = Dracula | ||
|
|
||
| tabs = 4 | ||
| true-color = always | ||
| hyperlinks = true | ||
| hyperlinks-file-link-format = "vscode://file/{path}:{line}" | ||
| # or: hyperlinks-file-link-format = "idea://open?file={path}&line={line}" | ||
| # or: hyperlinks-file-link-format = "pycharm://open?file={path}&line={line}" | ||
| [delta "interactive"] | ||
| diffFilter = delta --color-only --dark --features=interactive | ||
| diffFilter = delta --color-only --dark --features=interactive,unobtrusive-line-numbers,diff-so-fancy | ||
| keep-plus-minus-markers = false | ||
|
|
||
| [delta "decorations"] | ||
| commit-decoration-style = bold yellow box ul | ||
| file-style = bold yellow ul | ||
| file-decoration-style = none | ||
| hunk-header-decoration-style = yellow box | ||
| commit-decoration-style = blue ol | ||
| commit-style = raw | ||
| file-style = omit | ||
| hunk-header-decoration-style = blue box | ||
| # commit-style = raw | ||
| # file-style = omit | ||
| # hunk-header-decoration-style = blue box | ||
| hunk-header-file-style = red | ||
| hunk-header-line-number-style = "#067a00" | ||
| # hunk-header-line-number-style = "#067a00" | ||
| hunk-header-style = file line-number syntax | ||
|
|
||
| [delta "unobtrusive-line-numbers"] | ||
| line-numbers = true | ||
| line-numbers-minus-style = "#444444" | ||
|
|
@@ -106,18 +87,61 @@ | |
| line-numbers-left-style = blue | ||
| line-numbers-right-style = blue | ||
|
|
||
| # Kaleidoscope diff-tool | ||
| [difftool "Kaleidoscope"] | ||
| cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" | ||
| [mergetool "Kaleidoscope"] | ||
| cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot | ||
| trustExitCode = true | ||
|
|
||
| [safe] | ||
| directory = /github/workspace | ||
| # Diff-so-fancy diff-tool | ||
| [interactive] | ||
| diffFilter = diff-so-fancy --patch | ||
| diffFilter = delta --diff-so-fancy # diff-so-fancy --patch | ||
| [diff-so-fancy] | ||
| changeHunkIndicators = true | ||
| ### END DIFF ### | ||
|
|
||
| [safe] | ||
| directory = /github/workspace | ||
| [status] | ||
| submodulesummary = 1 | ||
| [rerere] # Reuse Recorded Resolution | ||
| enable = true | ||
| enabled = true | ||
| autoUpdate = true | ||
| [help] | ||
| autocorrect = 1 | ||
| [fetch] | ||
| prunetags = true | ||
| [log] | ||
| date = iso | ||
|
|
||
| # Alases | ||
| [alias] | ||
| init-safe-commit = !~/.safe-commit-hook/install-for-project.sh | ||
| quick-stats = ! /usr/local/bin/git-quick-stats | ||
| prune = fetch --prune | ||
| undo = reset --soft HEAD^ | ||
| glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' | ||
| logline = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | ||
| tree = log --graph --decorate --pretty=oneline --abbrev-commit | ||
| squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} -m \"${1:-A new start}\");};f" | ||
| #squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} -m \"${1:-Make Actions Great Again}\");};f" | ||
| scrub = reset --hard @{upstream} | ||
| recentb = "!r() { refbranch=$1 count=$2; git for-each-ref --sort=-committerdate refs/heads --format='%(refname:short)|%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:-20} | while read line; do branch=$(echo \"$line\" | awk 'BEGIN { FS = \"|\" }; { print $1 }' | tr -d '*'); ahead=$(git rev-list --count \"${refbranch:-origin/master}..${branch}\"); behind=$(git rev-list --count \"${branch}..${refbranch:-origin/master}\"); colorline=$(echo \"$line\" | sed 's/^[^|]*|//'); echo \"$ahead|$behind|$colorline\" | awk -F'|' -vOFS='|' '{$5=substr($5,1,70)}1' ; done | ( echo \"ahead|behind||branch|lastcommit|message|author\\n\" && cat) | column -ts'|';}; r" | ||
| runs = "!f() { \ | ||
| watch_gha_runs \ | ||
| \"$(git remote get-url origin)\" \ | ||
| \"$(git rev-parse --abbrev-ref HEAD)\"; \ | ||
| }; f" | ||
|
|
||
| # ********************* | ||
| # Rebase workflow | ||
| mainbranch = "!git remote show origin | sed -n '/HEAD branch/s/.*: //p'" | ||
| synced = "!git pull origin $(git mainbranch) --rebase" | ||
| update = "!git pull origin $(git rev-parse --abbrev-ref HEAD) --rebase" | ||
| squash = "!git rebase -v -i $(git mainbranch)" | ||
| publish = push origin HEAD --force-with-lease | ||
| pub = publish | ||
| ammend = commit --amend | ||
| amend = commit --amend | ||
| fpush = push | ||
| # ********************* | ||
|
|
||
|
|
||
| # [maintenance] | ||
| # repo = /path/to/example/repo | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.