From: David Kastrup Date: Wed, 08 Aug 2007 20:08:48 GMT Subject: Re: [PATCH] Mod. gitk to support REBASE (with stash support). Message-ID: <85lkclrdpr.fsf@lola.goethe.zz> In-Reply-To: Johannes Schindelin writes: > On Wed, 8 Aug 2007, Alexandre Bourget wrote: > >> --- >> Adds a context menu for commits, so that a 'rebase' can be done. >> >> Optionally, it will ask if you want to 'stash' current work before doing so. >> > > You want something like this as a commit message, _not_ between "---" and > diffstat. > > General question: should this not be in git-gui rather than gitk? Gitk as > of now is really more a viewing tool. Well, yes. But git-gui only works on a single branch head at a time, and that is not enough for rebasing. It would be really nice if git-gui did not outsource its branch handling and viewing to gitk. Could git-gui perhaps be merged with giggle at some point of time? Another option might be to let it talk with uDraw(Graph) over a socket: uDraw(Graph) keeps track of the graph layout and tells its client what has been dragged where. Rebasing would also be a fine operation for drag and drop on a graphical revision history/branch system: pull one head onto another, or mark one segment and pull it onto another head. And use the reflog to recover from catastrophes... -- David Kastrup, Kriemhildstr. 15, 44793 Bochum