Skip to content

Instantly share code, notes, and snippets.

@wenchy
Last active August 27, 2025 13:42
Show Gist options
  • Select an option

  • Save wenchy/2d7381b2f93600895e080a036fc1084a to your computer and use it in GitHub Desktop.

Select an option

Save wenchy/2d7381b2f93600895e080a036fc1084a to your computer and use it in GitHub Desktop.

Revisions

  1. wenchy revised this gist Aug 27, 2025. 1 changed file with 16 additions and 16 deletions.
    32 changes: 16 additions & 16 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -25,19 +25,6 @@
    tool = vimdiff
    [difftool]
    prompt = false
    [color]
    diff = auto
    status = auto
    branch = auto
    interactive = auto
    ui = true
    pager = true
    [color "status"]
    added = green
    changed = red bold
    untracked = magenta bold
    [color "branch"]
    remote = yellow
    [merge]
    tool = vimdiff
    [mergetool]
    @@ -49,13 +36,26 @@
    [rerere]
    enabled = true
    autoupdate = true
    [core]
    excludesfile = ~/.gitignore
    quotepath = off
    [rebase]
    autoSquash = true
    autoStash = true
    updateRefs = true
    [core]
    quotepath = off
    excludesfile = ~/.gitignore
    [color]
    diff = auto
    status = auto
    branch = auto
    interactive = auto
    ui = true
    pager = true
    [color "status"]
    added = green
    changed = red bold
    untracked = magenta bold
    [color "branch"]
    remote = yellow
    [alias]
    d = difftool
    di = difftool
  2. wenchy revised this gist Aug 27, 2025. 1 changed file with 37 additions and 5 deletions.
    42 changes: 37 additions & 5 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -1,14 +1,30 @@
    [user]
    name = yourname
    email = [email protected]
    name = yourname
    email = [email protected]
    [credential]
    helper = store
    [branch]
    sort = -committerdate
    [column]
    ui = auto
    [tag]
    sort = version:refname
    [push]
    default = simple
    autoSetupRemote = true
    followTags = true
    [fetch]
    prune = true
    pruneTags = true
    all = true
    [diff]
    algorithm = histogram
    colorMoved = plain
    mnemonicPrefix = true
    renames = true
    tool = vimdiff
    [difftool]
    prompt = false
    [credential]
    helper = store
    prompt = false
    [color]
    diff = auto
    status = auto
    @@ -26,6 +42,20 @@
    tool = vimdiff
    [mergetool]
    prompt = false
    [help]
    autocorrect = prompt
    [commit]
    verbose = true
    [rerere]
    enabled = true
    autoupdate = true
    [core]
    excludesfile = ~/.gitignore
    quotepath = off
    [rebase]
    autoSquash = true
    autoStash = true
    updateRefs = true
    [alias]
    d = difftool
    di = difftool
    @@ -37,5 +67,7 @@
    st = status
    last = log -1 HEAD
    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
    lg5 = lg -5
    lg10 = lg -10
    unstage = reset HEAD --
    s = "!f() { rev=${1-HEAD}; git difftool $rev^ $rev; }; f"
  3. wenchy created this gist Feb 20, 2019.
    41 changes: 41 additions & 0 deletions .gitconfig
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,41 @@
    [user]
    name = yourname
    email = [email protected]
    [push]
    default = simple
    [diff]
    tool = vimdiff
    [difftool]
    prompt = false
    [credential]
    helper = store
    [color]
    diff = auto
    status = auto
    branch = auto
    interactive = auto
    ui = true
    pager = true
    [color "status"]
    added = green
    changed = red bold
    untracked = magenta bold
    [color "branch"]
    remote = yellow
    [merge]
    tool = vimdiff
    [mergetool]
    prompt = false
    [alias]
    d = difftool
    di = difftool
    co = checkout
    br = branch
    pr = pull --rebase
    dc = dcommit
    ci = commit
    st = status
    last = log -1 HEAD
    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
    unstage = reset HEAD --
    s = "!f() { rev=${1-HEAD}; git difftool $rev^ $rev; }; f"