On 10/20/2015 04:07 PM, Georg Baum wrote:
...I mainly use git for LyX development like "svn + stash", and keep two separate working trees for branch and master.
I do the same, just because compiling is faster this way (and disk space is cheap).
Many git features are confusing for me as well, and I always have the impression that the defaults are wrong (e.g. I always use git cherry-pick -n). Fortunately all this is configurable,
It's particularly configurable via aliases. My own preference is for the options -e and -x, hence I have as a git alias:
cp = cherry-pick -e -x In memory of svn: ci = commit -a One can do almost anything with aliases. But, more importantly:
so if you find out a workflow once you can write it down and do not need to understand the details anymore for using it in the future.
This is the important thing, and it could even be put on the wiki. Richard