Skip to content

Instantly share code, notes, and snippets.

@woelfle

woelfle/.gitconfig

Last active April 17, 2021 19:35
Show Gist options
  • Save woelfle/79dff0f58a63a44f47f3ce88b5b9ac8a to your computer and use it in GitHub Desktop.
Save woelfle/79dff0f58a63a44f47f3ce88b5b9ac8a to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. woelfle revised this gist Apr 17, 2021. No changes.
  2. woelfle revised this gist Apr 17, 2021. 1 changed file with 2 additions and 1 deletion.
    3 changes: 2 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -32,7 +32,8 @@
    rebase-develop = pull --rebase origin develop

    [fetch]
    prune = true
    prune = true

    [push]
    default = current

  3. woelfle revised this gist Apr 17, 2021. 1 changed file with 47 additions and 1 deletion.
    48 changes: 47 additions & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -1 +1,47 @@
    ‎‎​
    [user]
    name = Thomas Wölfle
    email = [email protected]

    [color]
    ui = true

    [core]
    editor = vim
    excludefiles = ~/.gitignore
    hooksPath = .githooks

    [alias]
    alias = config --get-regexp alias
    ci = commit
    cleanup = "!git branch --merged | grep -v -P '^\\*|master|develop' | xargs -P8 -n1 -r git branch -d; echo Done cleaning local branche."
    co = checkout
    mc = diff --name-only --diff-filter=U
    st = status -sb .
    co-all = submodule foreach git checkout
    pull-all = submodule foreach git pull
    st-all = submodule foreach git st
    # Commit all staged/added files to the last commit.
    amend = commit --amend --reuse-message=HEAD
    # List all commits on the current branch that have not yet been pushed to develop.
    ahead-develop = log origin/develop..HEAD
    # Diff all commits on the current branch that have not yet been pushed to develop against the remote develop branch
    diff-ahead-develop = diff origin/develop..HEAD
    # Merge all changes that have been pushed to the develop branch onto the current branch.
    update = pull --rebase --autostash -X theirs origin develop
    # Rebase to the current state of the develop branch
    rebase-develop = pull --rebase origin develop

    [fetch]
    prune = true
    [push]
    default = current

    [mergetool "vscode"]
    cmd = code --wait $MERGED

    [merge]
    tool = vscode
    [diff]
    tool = vscode
    [difftool "vscode"]
    cmd = code --wait --diff $LOCAL $REMOTE
  4. woelfle created this gist Apr 17, 2021.
    1 change: 1 addition & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1 @@
    ‎‎​