Skip to content

Instantly share code, notes, and snippets.

@mike-boddin

mike-boddin/.gitconfig

Last active March 13, 2017 10:23
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save mike-boddin/12ddc6341cf866f527a4 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save mike-boddin/12ddc6341cf866f527a4 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. mike-boddin revised this gist Mar 13, 2017. 1 changed file with 1 addition and 0 deletions.
    1 change: 1 addition & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -10,6 +10,7 @@
    pg = log --graph --decorate=short --date=relative --all
    pullff = pull --ff-only
    pullr = pull -r
    stat = status --short --branch
    [credential]
    helper = cache --timeout=43200
    [merge]
  2. mike-boddin revised this gist Dec 8, 2015. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion gitedit.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -9,4 +9,4 @@ else
    fi

    echo "open editor for file '$PARAMS'"
    "$NOTEPAD_HOME/notepad++.exe" -multiInst -nosession -noPlugin "$(cygpath -w "$*")"
    "$NOTEPAD_HOME/notepad++.exe" -multiInst -nosession -noPlugin "$PARAMS"
  3. mike-boddin revised this gist Dec 8, 2015. 2 changed files with 13 additions and 0 deletions.
    1 change: 1 addition & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -1,5 +1,6 @@
    [core]
    autocrlf = true
    editor = gitedit.sh
    [user]
    name = Mike Boddin
    email = [email protected]
    12 changes: 12 additions & 0 deletions gitedit.sh
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,12 @@
    #!/bin/sh

    NOTEPAD_HOME="c:/Program Files (x86)/Notepad++"

    if [[ $(uname) == CYGWIN* ]] ; then
    PARAMS="$(cygpath -w "$*")"
    else
    PARAMS="$*"
    fi

    echo "open editor for file '$PARAMS'"
    "$NOTEPAD_HOME/notepad++.exe" -multiInst -nosession -noPlugin "$(cygpath -w "$*")"
  4. mike-boddin revised this gist Dec 8, 2015. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -19,4 +19,4 @@
    tool = kdiff3
    guitool = kdiff3
    [difftool "kdiff3"]
    path = $KDIFF_HOME/kdiff3.exe
    path = $KDIFF_HOME/kdiff3.exe
  5. mike-boddin created this gist Dec 8, 2015.
    22 changes: 22 additions & 0 deletions .gitconfig
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,22 @@
    [core]
    autocrlf = true
    [user]
    name = Mike Boddin
    email = [email protected]
    [push]
    default = simple
    [alias]
    pg = log --graph --decorate=short --date=relative --all
    pullff = pull --ff-only
    pullr = pull -r
    [credential]
    helper = cache --timeout=43200
    [merge]
    tool = kdiff3
    [mergetool "kdiff3"]
    path = $KDIFF_HOME/kdiff3.exe
    [diff]
    tool = kdiff3
    guitool = kdiff3
    [difftool "kdiff3"]
    path = $KDIFF_HOME/kdiff3.exe