5 commits

Author	SHA1	Message	Date
David Engster	692322388c	admin: Add documentation for gitmerge.el ... * gitmerge.el: New file. * notes/git-workflow: Add documentation for using it.	2014-11-27 23:23:48 +01:00
Lars Magne Ingebrigtsen	1af9075908	Set the push default to "current", which should work everywhere	2014-11-16 15:54:12 +01:00
Lars Magne Ingebrigtsen	af19cccc83	Mention how to get rid of X11 warnings	2014-11-16 15:31:20 +01:00
Lars Magne Ingebrigtsen	5fa7b7181a	Use cherry-pick -xe instead of git log amend	2014-11-15 19:25:45 +01:00
Lars Magne Ingebrigtsen	788bc73c80	Add a draft of a very simple git workflow	2014-11-15 17:06:34 +01:00