Re: Joining cg-*-id
From: Matthias Urlichs <hidden>
Date: 2016-06-15 22:42:06
Hi, Linus Torvalds wrote:
And if you select one of them at random (or by deciding which parent is the "primary" one), then git diff yesterday.. will show not the changes since yesterday, but _all_ the changes that came in through the merge.
IMHO the way out is to realize that you did the same thing yesterday,
so presumably, if we teach git to remember what yesterday's head was,
there's no problem.
So let's do a "git diff-since yesterday" which simply forks a
"git diff since/yesterday..HEAD", and then copies .git/HEAD to
.git/refs/since/yesterday.
Just don't call it "yesterday" in the documentation ;-) and print a nice
error message instead of an ugly one if the user hasn't run the program
before. (But still do the copy.)
--
Matthias Urlichs | {M:U} IT Design @ m-u-it.de | smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
- -
What if everything is an illusion and nothing exists? In that case, I
definitely overpaid for my carpet.
-- Woody Allen, "Without Feathers"