aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes/git-workflow (follow)
Commit message (Expand)AuthorAgeFilesLines
* admin: Add documentation for gitmerge.elDavid Engster2014-11-271-5/+51
* Set the push default to "current", which should work everywhereLars Magne Ingebrigtsen2014-11-161-0/+2
* Mention how to get rid of X11 warningsLars Magne Ingebrigtsen2014-11-161-0/+15
* Use cherry-pick -xe instead of git log amendLars Magne Ingebrigtsen2014-11-151-2/+1
* Add a draft of a very simple git workflowLars Magne Ingebrigtsen2014-11-151-0/+73