Skip to content

Instantly share code, notes, and snippets.

@edpichler

edpichler/.gitconfig

Forked from jeaye/.gitconfig
Last active August 31, 2020 10:56
Show Gist options
  • Save edpichler/4a75720b273bc0fcea309e65d97202a5 to your computer and use it in GitHub Desktop.
Save edpichler/4a75720b273bc0fcea309e65d97202a5 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. edpichler revised this gist Aug 31, 2020. 1 changed file with 2 additions and 21 deletions.
    23 changes: 2 additions & 21 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -48,32 +48,13 @@
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
    [diff]
    tool = vim
    renamelimit = 100000
    [difftool "vim"]
    cmd = vim -d -R "$LOCAL" "$REMOTE"
    [difftool "vim_ignore_whitespace"]
    cmd = vim -c 'set diffopt+=iwhite' -d -R "$LOCAL" "$REMOTE"
    [difftool]
    prompt = false
    [push]
    default = simple
    [core]
    pager = less -R
    excludesfile = /home/jeaye/.gitignore
    [gist]
    private = yes
    browse = no
    [filter "lfs"]
    required = true
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    [commit]
    gpgsign = true
    [stash]
    showPatch = 1
    #[stash]
    # showPatch = 1
    [pager]
    log = less
    show = less -R
  2. @jeaye jeaye created this gist Jun 9, 2020.
    82 changes: 82 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,82 @@
    [user]
    name = jeaye
    email = <redacted>
    [color]
    all = true
    ui = true
    branch = auto
    diff = auto
    status = auto
    [color "branch"]
    current = yellow reverse
    local = yellow
    remote = green
    [color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
    [color "status"]
    added = green
    changed = red
    untracked = yellow
    [alias]
    po = push origin
    pu = push upstream
    c = commit
    cp = cherry-pick
    ch = checkout
    st = status --column -sb
    sup = submodule update --recursive --init
    d = difftool --ignore-submodules
    di = difftool --tool=vim_ignore_whitespace -w --ignore-submodules
    ds = difftool --stat --ignore-submodules
    ll = log --pretty=oneline --graph --abbrev-commit --decorate --topo-order
    dp = difftool --tool=patch --ignore-submodules --minimal -w
    clr = clone --recursive
    find = log --pickaxe-all -S
    fpull = "!f(){ git pull \"$1\" \"$2\" && git fat pull; };f"
    fpush = "!f(){ git push \"$1\" \"$2\" && git fat push; };f"
    reset-time = "!f(){ touch -camft $(git log --date=iso --pretty=format:%cd -1 HEAD -- \"$1\" | sed 's/-//g;s/ //;s/://;s/:/./' | cut -d' ' -f1) \"$1\"; };f"
    deploy = push heroku
    [merge]
    keepBackup = false
    tool = custom_merge
    renamelimit = 100000
    [mergetool "custom_merge"]
    cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
    keepTemporaries = false
    trustExitCode = false
    keepBackup = false
    [diff]
    tool = vim
    renamelimit = 100000
    [difftool "vim"]
    cmd = vim -d -R "$LOCAL" "$REMOTE"
    [difftool "vim_ignore_whitespace"]
    cmd = vim -c 'set diffopt+=iwhite' -d -R "$LOCAL" "$REMOTE"
    [difftool]
    prompt = false
    [push]
    default = simple
    [core]
    pager = less -R
    excludesfile = /home/jeaye/.gitignore
    [gist]
    private = yes
    browse = no
    [filter "lfs"]
    required = true
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    [commit]
    gpgsign = true
    [stash]
    showPatch = 1
    [pager]
    log = less
    show = less -R
    diff = less -R
    [help]
    autocorrect = 1