Skip to contentSkip to conversation

Stupid GIT question...

DISCUSSION [email protected] 2 participants 2 messages Apr 18, 2007

lore
Share & tools
lore
#0 lore raw

I have a GIT tree (iwlwifi, but the problem is my idiocy, not the tree ;).

What's the command to get a diff of "what I would merge if I said 'git pull'?" (similar to what 'cvs diff' does - AFAICT, 'git diff HEAD .' diffs my *current* pull of the tree against itself and does nothing...

#1 lore raw
Quoted 1 line · [email protected] writes:

What's the command to get a diff of "what I would merge if I said 'git pull'?"

$ git fetch
$ git diff master origin

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."