I'm not a kicad dev, just an avid reader of the list, but I am pretty
fluent in git.
Here are some aliases that you might find useful (that go in your
co = checkout
ci = commit
st = status
br = branch
hist = log --all --abbrev-commit --graph --date=short
--pretty=format:\"%h %C(yellow)%aN %C(green)| %C(cyan)%d%Creset%s\"
histd = log --all --abbrev-commit --graph --date=short
--pretty=format:\"%h %C(green)%ad %C(yellow)%aN%Creset |
ll = log --all --stat --abbrev-commit --graph
--pretty=format:\"%C(green)%h %aN | %C(yellow)%d%C(green)%s\"
type = cat-file -t
dump = cat-file -p
d = whatchanged -1 -p
del = !git rm $(git ls-files --deleted)
dc = diff --cached
wd = diff --word-diff
cw = diff --color-words
b = blame -w
I tend to use `git hist` and `git st` all the time. So that I can always
see what's going on, I never use git pull, I always use git fetch
instead. That seems to be in-line with what Wayne expects, since he says
to rebase your changes. git pull would do a fetch and merge together,
but you want to fetch and rebase -- you can set your .gitconfig to do
the fetch and rebase, but I think it's easier to follow along with
what's going on if you do the fetch separately and check the tree each
time with git hist.
Mailing list: https://launchpad.net/~kicad-developers
Post to : email@example.com
Unsubscribe : https://launchpad.net/~kicad-developers
More help : https://help.launchpad.net/ListHelp