<fijal>
8:03 AM <fijal> so merge, browse the diff *then* commit?
<fijal>
8:03 AM <fijal> how do I see what's the diff between branches?
<LarstiQ>
diffing between branches I usually do `git diff branch1..branch2` or `git diff branch1...branch2` depending on whether I want to see changes from the merge base
<LarstiQ>
if you have locally done a `git merge` but not commmited that yet your working tree has additional changes, I don't often compare that to another branch but I'd guess that is `git diff branch`
<LarstiQ>
(the reason for guessing is that there are 3 things to diff with, local working dir, local staged changes (index), and latest commit in the branch you've checked out, I always have to look up how to distinguish)
<LarstiQ>
fijal: does that help?
<fijal>
I don't know
<fijal>
if I do git merge --no-commit
<fijal>
and then do "git diff", it shows empty
<fijal>
or do I need to do "git diff branch"?
<fijal>
LarstiQ: ?
<LarstiQ>
fijal: what do you want to compare it against, see what you're going to commit?
<LarstiQ>
fijal: is `git diff --cached` non-empty?
<fijal>
yeah
<fijal>
--cached did the job, thank you
<fijal>
LarstiQ: is there any logic behind it?
<LarstiQ>
fijal: yeah, it's due to git's index, the area of staged changes
<LarstiQ>
so if you incrementally `git add` stuff to be commited, your `git diff` will shrink and your `git diff --cached` will grow
<LarstiQ>
I personally mostly use it similar to github's marking a file as viewed (but on the level of diff hunks), to keep track of what I already know is good vs what I still need to look at it
<LarstiQ>
as well as a rebasing tool to split and reverse commits
<LarstiQ>
fijal: np, glad to be of help
otisolsen70 has joined #pypy
otisolsen70 has quit [Remote host closed the connection]
otisolsen70 has joined #pypy
<mattip>
tumbleweed: this is the first time I have seen an announcement like that
xcm has joined #pypy
lehmrob has joined #pypy
otisolsen70 has quit [Quit: Leaving]
slav0nic has joined #pypy
lehmrob has quit [Quit: Konversation terminated!]
lehmrob has joined #pypy
lritter has joined #pypy
Atque has joined #pypy
Atque has quit [Remote host closed the connection]
Atque has joined #pypy
otisolsen70 has joined #pypy
Atque has quit [Quit: ...]
LarstiQ has quit [Remote host closed the connection]
LarstiQ has joined #pypy
greedom has joined #pypy
greedom has quit [Remote host closed the connection]
greedom has joined #pypy
lehmrob has quit [Quit: Konversation terminated!]
Cheery has quit [Ping timeout: 250 seconds]
Cheery has joined #pypy
toulene_ has joined #pypy
toulene_ has quit [Remote host closed the connection]
<Corbin>
I miss polymorphic recursion. Is there a way to let a subclass vary in its return type? Like, to have polymorphic visitors? Or do I need to use a class-maker pattern, ala make_timsort_class(), for every new return type?
<Corbin>
...Oh, I can work around it for now. I still miss it, but that's just a feeling.
<krono>
Corbin: in pypy or rpython?
<Corbin>
krono: Oh, sorry, in RPython. In PyPy, we have standard duck-typing idioms and we can do e.g. tagless-final encodings or polymorphic visitors without any extra effort.
<krono>
yeah, i wondered. i missed that, too
<krono>
some things are painful, esp if you come from a smalltalk background xD
<Corbin>
It's certainly a curious environment. First-order structures, but an unlimited amount of one-time codegen and metaprogramming too. I could analogize it to OCaml, Haskell, Java, C++, etc.
greedom has quit [Remote host closed the connection]
greedom has joined #pypy
[Arfrever] has quit [Read error: Connection reset by peer]
[Arfrever] has joined #pypy
mgorny has quit [Ping timeout: 250 seconds]
greedom has quit []
greedom has joined #pypy
greedom has quit []
otisolsen70 has quit [Quit: Leaving]
lritter has quit [Ping timeout: 256 seconds]
mgorny has joined #pypy
slav0nic has quit [Ping timeout: 240 seconds]
ctismer has quit [Read error: Connection reset by peer]
ctismer has joined #pypy
cfbolz has quit [Read error: Connection reset by peer]