Hi, On Sun, 16 Apr 2006, Linus Torvalds wrote: > On Sun, 16 Apr 2006, Johannes Schindelin wrote: > > > > Thanks for all your help, but in this case it was not irrelevant. Because > > I *had* the function in my working copy. And I had changed it. So I had to > > find out where to move the change. > > Right, but it was irrelevant as far as "top-of-head" was concerned (which > is all that "git log" shows you - it doesn't care about your working > tree). > > The fact that it _had_ been relevant in the state you used to be at is not > something "git log" and friends know or care about. > > Now, I'm not disputing that we might want to make it easier to see what > _had_ been relevant at some earlier time. But you'd have to specify that > earlier time somehow. Since quite some time, I wanted to have a way to git-rev-list just the revs between commit1 and commit2, i.e. all commits which are ancestors of commit2, and which have commit1 as ancestor. With this, my task would have been more than simple. > I assume you had tried to do a "git rebase", and the problem with that > is that git rebase really doesn't help you at all when things go wrong, > exactly because "rebase" - by design - screws up the history and loses > that information for you. Nope. Was a merge. > If your problem state had been as a result of a "git merge", you'd > actually have had much better tools available to you, exactly because > merge doesn't screw up history, so you've got both sides of the merge you > can look at (HEAD and MERGE_HEAD, and "git diff --ours" and "--theirs"). That outputs too much. I really wanted to find just the commit which removed the function, in order to know where the code was moved to. ORIG_HEAD would not help, because that commit is not an ancestor. > [...] In particular, you can do > > gitk ORIG_HEAD.. ... and it will say Error: expected integer but got "" while executing "clock format $d -format "%Y-%m-%d %H:%M:%S "" (procedure "formatdate" line 2) invoked from within "formatdate $date" (procedure "drawcmittext" line 28) invoked from within "drawcmittext $id $row $col $rmx" (procedure "drawcmitrow" line 41) invoked from within "drawcmitrow $row" (procedure "showstuff" line 35) invoked from within "showstuff $canshow" (procedure "layoutmore" line 15) invoked from within "layoutmore" (procedure "getcommitlines" line 91) invoked from within "getcommitlines file7" Sorry, I am too tired now to investigate, have been working already to long. Tomorrow's another day. Ciao, Dscho - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html