diff options
| author | nsfisis <nsfisis@gmail.com> | 2021-11-13 08:42:53 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2021-11-13 08:42:53 +0900 |
| commit | f8b509c32ccdf00af1dc68ec94e00f1739cfb3ac (patch) | |
| tree | fd4232458c881cee47d58becada8e528f84bdbf2 /.gitconfig | |
| parent | d8e06ab783bda536a92993d36f91b0eb27215f39 (diff) | |
| download | dotfiles-f8b509c32ccdf00af1dc68ec94e00f1739cfb3ac.tar.gz dotfiles-f8b509c32ccdf00af1dc68ec94e00f1739cfb3ac.tar.zst dotfiles-f8b509c32ccdf00af1dc68ec94e00f1739cfb3ac.zip | |
git: move .gitconfig to .config/git/config
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 22acdc3..0000000 --- a/.gitconfig +++ /dev/null @@ -1,116 +0,0 @@ -[core] - editor = vim - commentchar = ";" - -[help] - autocorrect = 1 - -[advice] - detachedhead = false - -[color] - ui = true - -[merge] - tool = vimdiff - ff = false - -[rebase] - abbreviatecommands = true - autosquash = true - autostash = true - -[diff] - tool = vimdiff - -[init] - defaultbranch = main - -[blame] - coloring = repeatedLines - -[mergetool] - keepbackup = false - -[credential] - helper = osxkeychain - -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true - -[alias] - a = add - ap = add -p - b = branch - current-branch = rev-parse --abbrev-ref HEAD - c = commit - fixup = commit --fixup - amend = commit --amend --no-edit - clone1 = clone --depth=1 - co = checkout - cob = checkout -b - com = "!__fn() { \ - if git rev-parse --verify --quiet main > /dev/null 2>&1; then \ - git checkout main \"$@\"; \ - elif git rev-parse --verify --quiet origin/main > /dev/null 2>&1; then \ - git checkout origin/main \"$@\"; \ - elif git rev-parse --verify --quiet master > /dev/null 2>&1; then \ - git checkout master \"$@\"; \ - elif git rev-parse --verify --quiet origin/master > /dev/null 2>&1; then \ - git checkout origin/master \"$@\"; \ - else \ - echo 'error: no branch found' >&2; \ - fi; \ - }; __fn" - cod = "!__fn() { \ - if git rev-parse --verify --quiet develop > /dev/null 2>&1; then \ - git checkout develop \"$@\"; \ - elif git rev-parse --verify --quiet origin/develop > /dev/null 2>&1; then \ - git checkout origin/develop \"$@\"; \ - else \ - echo 'error: no branch found' >&2; \ - fi; \ - }; __fn" - d = diff - dc = diff --cached - g = grep - gf = grep --name-only - s = status --short - tmp = commit -a -m "TMP" - tmps = stash save "TMP" - ctmp = commit -m "TMP" - sst = stash save "TMP" - ss = stash save - ssl = stash list - ssa = stash apply - ssd = stash drop - ssp = stash pop - last = log --pretty=fuller -1 - l = "!__fn() { \ - local last_merge_commit=\"$(git last-merge-commit)\"; \ - if [[ -n \"$last_merge_commit\" ]]; then \ - git log --oneline --boundary \"$last_merge_commit\".. \"$@\"; \ - else \ - git log --oneline -n 10 \"$@\"; \ - fi; \ - }; __fn" - ll = log --oneline - logf = log --pretty=fuller - graph = log --oneline --graph - r = rebase - ri = rebase -i - rid = rebase -i develop - rc = "!GIT_EDITOR=true git rebase --continue" - m = merge --no-edit - mc = "!GIT_EDITOR=true git merge --continue" - mm = mergetool - pullu = "!git pull upstream $(git current-branch) --ff" - pullo = "!git pull origin $(git current-branch) --ff" - pusho = "!git push origin $(git current-branch)" - cpick = cherry-pick - cpickc = "!GIT_EDITOR=true cherry-pick --continue" - empty = commit --allow-empty - last-merge-commit = "!git rev-list --abbrev-commit --merges HEAD | head -n 1" |
