emacs/admin/notes/git-workflow, branch xwidget Emacs is the extensible, customizable, self-documenting real-time display editor. admin: Add documentation for gitmerge.el 2014-11-27T22:23:48+00:00 David Engster 2014-11-27T22:17:40+00:00 692322388c9f5bdebf2e8c4f7434c1d4769a04cc * gitmerge.el: New file. * notes/git-workflow: Add documentation for using it. 
* gitmerge.el: New file.
* notes/git-workflow: Add documentation for using it.
Set the push default to "current", which should work everywhere 2014-11-16T14:54:12+00:00 Lars Magne Ingebrigtsen 2014-11-16T14:54:12+00:00 1af9075908ed922e13d6d5a6b4f51f093d79f7f1 






Mention how to get rid of X11 warnings
2014-11-16T14:31:20+00:00

Lars Magne Ingebrigtsen

2014-11-16T14:31:20+00:00

af19cccc837b1371911988cf99c8c6140bb9cc4a












Use cherry-pick -xe instead of git log amend
2014-11-15T18:25:45+00:00

Lars Magne Ingebrigtsen

2014-11-15T18:25:29+00:00

5fa7b7181a2c474c6e0b9480d92e34305bca31ed












Add a draft of a very simple git workflow
2014-11-15T16:06:34+00:00

Lars Magne Ingebrigtsen

2014-11-15T16:06:34+00:00

788bc73c80bcd1e748a389692963c1464ba963df