Re: [PATCH] Mod. gitk to support REBASE (with stash support).
From: David Kastrup <hidden>
Date: 2016-06-15 22:43:28
"Shawn O. Pearce" [off-list ref] writes:
David Kastrup [off-list ref] wrote:quoted
"Shawn O. Pearce" [off-list ref] writes:quoted
quoted
Well, yes. But git-gui only works on a single branch head at a time, and that is not enough for rebasing.Sure. But so does git's command line tools. They tend to only work on a single branch at time, the one called `HEAD`."tend", and many accept an explicit override: rebase accepts three commit names, for example. Those that _write_ into the repository usually _end_ up at HEAD, but most need not start there. And git-gui does not have any operation either looking at or working other than on the current HEAD. No diff, no file view, no rebase, nothing.Uh, "Repository->Browse Browse Branch Files..." will let you look at files from any commit-ish, not just HEAD or an existing branch.
Duh. But why are the menus called "Browse master's Files" and "Browse Branch Files" rather than "Browse heads/master" or "Browse master's head" versus "Browse any commit" or maybe just "Browse current" and "Browse at ..."? "Browse Branch Files" is _really_ misleading.
You can open many file browsers at once against the same commit or different commits. Double clicking a file opens it in the blame viewer, which itself can move around history a little bit.
I though about the blame window after my first posting (actually, I did not yet notice one can move around in the revisions in the blame. Nice. Now if it supported utf-8 files...). Well, yes.
"Merge->Local Merge..." will let you select any another commit to merge with this current branch. That's two commits.
Ok, ok. Still, commits and history are much more visible as whole in gitk: git-gui mostly lets one pick out single views (the blame window is probably the closest one gets to moving about, but then it _is_ a moving view which always shows a single point of time ultimately).
So your assertion that git-gui only works with one commit, HEAD, is wrong.
Yes. -- David Kastrup