[Dart-dev] little git bits

Tim Hoar thoar at ucar.edu
Tue Dec 10 14:12:45 MST 2019


I took a class in git years ago and the only thing I remember is that I
have a   ~/.gitconfig
I don't know what many of them do anymore (especially the lfs ... large
file support?)
The mergetool might not be useful ... I don't have any [diff] options ...
but hey ... take them for what they are worth.
I only have the [user] and [alias] blocks in my .gitconfig on cheyenne.
If anyone wants to improve upon these and share their results - I am all
ears.

The alias I had to be able to support 'diffuse' on a branch on a worktree
(yes, that's a thing) is:
git difftool --tool=diffuse --no-prompt !*


0[1004] cisl-delft:~ % cat .gitconfig
[core]
        excludesfile = /Users/thoar/.gitignore_global
        editor = vim
[mergetool "sourcetree"]
        cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh
\"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
        trustExitCode = true
[user]
        name = Tim Hoar
        email = thoar at ucar.edu
[push]
        default = simple
[alias]
        git     = rev-parse --git-dir
        lol     = log --graph --decorate --oneline --all
        short   = log --abbrev-commit --pretty=oneline
        root    = rev-parse --show-toplevel
        whatis  = show -s --pretty='tformat:%h (%s, %ad)' --date=short #
Junio Hamano
        co      = checkout
        br      = branch
        ci      = commit
        st      = status
        unstage = reset HEAD --
        last    = log -1 HEAD
[filter "lfs"]
        clean = git-lfs clean -- %f
        smudge = git-lfs smudge -- %f
        process = git-lfs filter-process
        required = true


Tim Hoar
Data Assimilation Research Section
National Center for Atmospheric Research
thoar at ucar.edu
303.497.1708
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.ucar.edu/pipermail/dart-dev/attachments/20191210/ef9897e3/attachment.html>


More information about the Dart-dev mailing list