Meld and git

Yeah, sometimes you forget, sometimes you get a new machine and forgot to version control your settings. I’ve hear it happens to people. :-)


    email =
    name = Fredrik Wendt

    tool = meld

    prompt = false

[difftool "meld"]
    cmd = meld "$REMOTE" "$LOCAL"

    tool = meld

[mergetool "meld"]
    cmd = meld "$REMOTE" "$MERGED" "$LOCAL" --output "$MERGED"

    default = simple

    st = status
    tree = log --graph --decorate --pretty=oneline --abbrev-commit
    lol = log --graph --oneline --decorate
    hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
    unstage = reset --

    autocrlf = input
    excludesfile = /home/ceda/.gitignore

    rebase = true
[url ""]
	insteadOf =
	date = iso

And some nice commands:

$ git difftool -d master..mystuff
$ git checkout master
$ git merge mybranch
$ meld .  # launches the directory view of the merge conflict
This work by Fredrik Wendt is licensed under CC by-sa.