Hi Junio On 28/02/18 15:37, Junio C Hamano wrote: > Phillip Wood <phillip.wood@xxxxxxxxxxxx> writes: > >> Is there an easy way for contributors to compare the branch they post to >> what ends up it pu? > > Distributed work is pretty much symmetric, so it can be done the > same way as one would review a rerolled series by another co-worker. > > $ git log --oneline --first-parent origin/master..origin/pu > > would show merges of topic branches, so you can find the tip of the > topic of your earlier submission (it would be one $commit^2; call > that $topic). origin/master..$topic would be the one branch > (i.e. what is in 'pu') to be compared. > > The other branch to be compared is what you sent the previous one > out of, or the new version of the patches. > > To compare two branches, git://github.com/trast/tbdiff is one of the > easier way. > > Before I learned about the tool, I used to "format-patch --stdout" > on both branches, and ran "diff -u" between them, as a crude measure; > it was more useful for spotting typofixes in the log messages than > code changes, before I got good at reading diff of diffs ;-). > > Also, tentatively rebasing the two branches on a common base, and > then doing "git diff $oldtopic~$N $newtopic~$N" or something like > that for varying value of $N (and N==0 is a good way for final > sanity checks). Thanks for the tips, tbdiff looks useful (I just need to learn to read diffs of diffs!). I also find rebasing them on a common ancestor useful but its a bit tedious. Thanks again Phillip
