-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: add init branch main to gitconfig
- Loading branch information
Showing
1 changed file
with
120 additions
and
116 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,213 +1,217 @@ | ||
| # Sample gitconfig | ||
| # shellcheck disable=all | ||
| # | ||
| # Sample gitconfig | ||
|
|
||
| [hub] | ||
|
|
||
| protocol = https | ||
| protocol = https | ||
|
|
||
| [user] | ||
|
|
||
| name = AUTHORNAME | ||
| email = AUTHOREMAIL | ||
| name = AUTHORNAME | ||
| email = AUTHOREMAIL | ||
|
|
||
| [credential] | ||
|
|
||
| helper = GIT_CREDENTIAL_HELPER | ||
| helper = GIT_CREDENTIAL_HELPER | ||
|
|
||
| [init] | ||
|
|
||
| defaultBranch = main | ||
|
|
||
| [alias] | ||
|
|
||
| co = checkout | ||
| promote = !$DOTFILES/bin/git-promote | ||
| wtf = !$DOTFILES/bin/git-wtf | ||
| rank-contributors = !$DOTFILES/bin/git-rank-contributors | ||
| count = !git shortlog -sn | ||
| co = checkout | ||
| promote = !$DOTFILES/bin/git-promote | ||
| wtf = !$DOTFILES/bin/git-wtf | ||
| rank-contributors = !$DOTFILES/bin/git-rank-contributors | ||
| count = !git shortlog -sn | ||
|
|
||
| # View abbreviated SHA, description, and history graph of the latest 20 commits | ||
| l = log --pretty=oneline -n 20 --graph --abbrev-commit | ||
| # View abbreviated SHA, description, and history graph of the latest 20 commits | ||
| l = log --pretty=oneline -n 20 --graph --abbrev-commit | ||
|
|
||
| # View the current working tree status using the short format | ||
| s = status -s | ||
| # View the current working tree status using the short format | ||
| s = status -s | ||
|
|
||
| # Show the diff between the latest commit and the current state | ||
| d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat" | ||
| # Show the diff between the latest commit and the current state | ||
| d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat" | ||
|
|
||
| # `git di $number` shows the diff between the state `$number` revisions ago and the current state | ||
| di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d" | ||
| # `git di $number` shows the diff between the state `$number` revisions ago and the current state | ||
| di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d" | ||
|
|
||
| # Pull in remote changes for the current repository and all its submodules | ||
| p = !"git pull; git submodule foreach git pull origin master" | ||
| # Pull in remote changes for the current repository and all its submodules | ||
| p = !"git pull; git submodule foreach git pull origin main" | ||
|
|
||
| # Clone a repository including all submodules | ||
| c = clone --recursive | ||
| # Clone a repository including all submodules | ||
| c = clone --recursive | ||
|
|
||
| # Commit all changes | ||
| ca = !git add -A && git commit -av | ||
| # Commit all changes | ||
| ca = !git add -A && git commit -av | ||
|
|
||
| # Switch to a branch, creating it if necessary | ||
| go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f" | ||
| # Switch to a branch, creating it if necessary | ||
| go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f" | ||
|
|
||
| # Show verbose output about tags, branches or remotes | ||
| tags = tag -l | ||
| branches = branch -a | ||
| remotes = remote -v | ||
| # Show verbose output about tags, branches or remotes | ||
| tags = tag -l | ||
| branches = branch -a | ||
| remotes = remote -v | ||
|
|
||
| # Amend the currently staged files to the latest commit | ||
| amend = commit --amend --reuse-message=HEAD | ||
| # Amend the currently staged files to the latest commit | ||
| amend = commit --amend --reuse-message=HEAD | ||
|
|
||
| # Credit an author on the latest commit | ||
| credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" | ||
| # Credit an author on the latest commit | ||
| credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f" | ||
|
|
||
| # Interactive rebase with the given number of latest commits | ||
| reb = "!r() { git rebase -i HEAD~$1; }; r" | ||
| # Interactive rebase with the given number of latest commits | ||
| reb = "!r() { git rebase -i HEAD~$1; }; r" | ||
|
|
||
| # Find branches containing commit | ||
| fb = "!f() { git branch -a --contains $1; }; f" | ||
| # Find branches containing commit | ||
| fb = "!f() { git branch -a --contains $1; }; f" | ||
|
|
||
| # Find tags containing commit | ||
| ft = "!f() { git describe --always --contains $1; }; f" | ||
| # Find tags containing commit | ||
| ft = "!f() { git describe --always --contains $1; }; f" | ||
|
|
||
| # Find commits by source code | ||
| fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f" | ||
| # Find commits by source code | ||
| fc = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short -S$1; }; f" | ||
|
|
||
| # Find commits by commit message | ||
| fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f" | ||
| # Find commits by commit message | ||
| fm = "!f() { git log --pretty=format:'%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f" | ||
|
|
||
| # Remove branches that have already been merged with master | ||
| # a.k.a. ‘delete merged’ | ||
| dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" | ||
| # Remove branches that have already been merged with main | ||
| # a.k.a. ‘delete merged’ | ||
| dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d" | ||
|
|
||
| # List contributors with number of commits | ||
| contributors = shortlog --summary --numbered | ||
| # List contributors with number of commits | ||
| contributors = shortlog --summary --numbered | ||
|
|
||
| # Merge GitHub pull request on top of the `master` branch | ||
| mpr = "!f() { \ | ||
| if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \ | ||
| git fetch origin refs/pull/$1/head:pr/$1 && \ | ||
| git rebase master pr/$1 && \ | ||
| git checkout master && \ | ||
| git merge pr/$1 && \ | ||
| git branch -D pr/$1 && \ | ||
| git commit --amend -m \"$(git log -1 --pretty=%B)\n\nCloses #$1.\"; \ | ||
| fi \ | ||
| }; f" | ||
| # Merge GitHub pull request on top of the `main` branch | ||
| mpr = "!f() { \ | ||
| if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \ | ||
| git fetch origin refs/pull/$1/head:pr/$1 && \ | ||
| git rebase main pr/$1 && \ | ||
| git checkout main && \ | ||
| git merge pr/$1 && \ | ||
| git branch -D pr/$1 && \ | ||
| git commit --amend -m \"$(git log -1 --pretty=%B)\n\nCloses #$1.\"; \ | ||
| fi \ | ||
| }; f" | ||
|
|
||
|
|
||
| [color] | ||
|
|
||
| diff = auto | ||
| status = auto | ||
| branch = auto | ||
| ui = true | ||
| diff = auto | ||
| status = auto | ||
| branch = auto | ||
| ui = true | ||
|
|
||
| # Use colors in Git commands that are capable of colored output when | ||
| # outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.) | ||
| ui = auto | ||
| # Use colors in Git commands that are capable of colored output when | ||
| # outputting to the terminal. (This is the default setting in Git ≥ 1.8.4.) | ||
| ui = 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 # line info | ||
| old = red # deletions | ||
| new = green # additions | ||
| meta = yellow bold | ||
| frag = magenta bold # line info | ||
| old = red # deletions | ||
| new = green # additions | ||
|
|
||
|
|
||
| [color "status"] | ||
|
|
||
| added = yellow | ||
| changed = green | ||
| untracked = cyan | ||
| added = yellow | ||
| changed = green | ||
| untracked = cyan | ||
|
|
||
|
|
||
| [core] | ||
|
|
||
| # Use custom `.gitignore` and `.gitattributes` | ||
| excludesfile = ~/.gitignore | ||
| attributesfile = ~/.gitattributes | ||
| editor = vim | ||
| # Use custom `.gitignore` and `.gitattributes` | ||
| excludesfile = ~/.gitignore | ||
| attributesfile = ~/.gitattributes | ||
| editor = vim | ||
|
|
||
| # Treat spaces before tabs and all kinds of trailing whitespace as an error | ||
| # [default] trailing-space: looks for spaces at the end of a line | ||
| # [default] space-before-tab: looks for spaces before tabs at the beginning of a line | ||
| whitespace = space-before-tab,-indent-with-non-tab,trailing-space | ||
| # Treat spaces before tabs and all kinds of trailing whitespace as an error | ||
| # [default] trailing-space: looks for spaces at the end of a line | ||
| # [default] space-before-tab: looks for spaces before tabs at the beginning of a line | ||
| whitespace = space-before-tab,-indent-with-non-tab,trailing-space | ||
|
|
||
| # Make `git rebase` safer on macOS | ||
| # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/> | ||
| trustctime = false | ||
| # Make `git rebase` safer on macOS | ||
| # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/> | ||
| trustctime = false | ||
|
|
||
| # Prevent showing files whose names contain non-ASCII symbols as unversioned. | ||
| # http://michael-kuehnel.de/git/2014/11/21/git-mac-osx-and-german-umlaute.html | ||
| precomposeunicode = false | ||
| # Prevent showing files whose names contain non-ASCII symbols as unversioned. | ||
| # http://michael-kuehnel.de/git/2014/11/21/git-mac-osx-and-german-umlaute.html | ||
| precomposeunicode = false | ||
|
|
||
|
|
||
| [apply] | ||
|
|
||
| # Detect whitespace errors when applying a patch | ||
| #whitespace = nowarn | ||
| whitespace = fix | ||
| # Detect whitespace errors when applying a patch | ||
| #whitespace = nowarn | ||
| whitespace = fix | ||
|
|
||
|
|
||
| [mergetool] | ||
|
|
||
| keepBackup = false | ||
| keepBackup = false | ||
|
|
||
|
|
||
| [difftool] | ||
|
|
||
| prompt = false | ||
| prompt = false | ||
|
|
||
| # Detect copies as well as renames | ||
| renames = copies | ||
| # Detect copies as well as renames | ||
| renames = copies | ||
|
|
||
|
|
||
| [help] | ||
|
|
||
| # Automatically correct and execute mistyped commands | ||
| autocorrect = 1 | ||
| # Automatically correct and execute mistyped commands | ||
| autocorrect = 1 | ||
|
|
||
|
|
||
| [merge] | ||
|
|
||
| # Include summaries of merged commits in newly created merge commit messages | ||
| log = true | ||
| # Include summaries of merged commits in newly created merge commit messages | ||
| log = true | ||
|
|
||
|
|
||
| [push] | ||
|
|
||
| # See `git help config` (search for push.default) | ||
| # for more information on different options of the below setting. | ||
| # | ||
| # Setting to git 2.0 default to suppress warning message | ||
| default = simple | ||
|
|
||
| # See `git help config` (search for push.default) | ||
| # for more information on different options of the below setting. | ||
| # | ||
| # Setting to git 2.0 default to suppress warning message | ||
| default = simple | ||
|
|
||
|
|
||
| # URL shorthands | ||
|
|
||
| [url "[email protected]:"] | ||
|
|
||
| insteadOf = "gh:" | ||
| pushInsteadOf = "github:" | ||
| pushInsteadOf = "git://github.com/" | ||
| insteadOf = "gh:" | ||
| pushInsteadOf = "github:" | ||
| pushInsteadOf = "git://github.com/" | ||
|
|
||
| [url "git://github.com/"] | ||
|
|
||
| insteadOf = "github:" | ||
| insteadOf = "github:" | ||
|
|
||
| [url "[email protected]:"] | ||
|
|
||
| insteadOf = "gst:" | ||
| pushInsteadOf = "gist:" | ||
| pushInsteadOf = "git://gist.github.com/" | ||
| insteadOf = "gst:" | ||
| pushInsteadOf = "gist:" | ||
| pushInsteadOf = "git://gist.github.com/" | ||
|
|
||
| [url "git://gist.github.com/"] | ||
|
|
||
| insteadOf = "gist:" | ||
| insteadOf = "gist:" | ||
|
|