Skip to contentSkip to conversation

Documentation: DocBook/drm, basic copyediting

GIT PULL Randy Dunlap 2 participants 3 messages Oct 26, 2011 – Nov 7, 2011

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git docs-move

to get these changes from Michael Witten:

  Documentation/DocBook/drm.tmpl | 308 +++++++++++++++++++++------------------
  drivers/gpu/drm/i915/i915_drv.c|   4 +-
  2 files changed, 170 insertions(+), 142 deletions(-)

Note: Please check that I haven't mucked up somewhere, because this:

$ git diff -M --stat --summary master..HEAD

shows me more than the changes above.
Maybe that's the wrong command options to use?

thanks,

Signature · 1 line
~Randy
#1 lore raw
Quoted 5 lines · Randy Dunlap

Note:  Please check that I haven't mucked up somewhere, because this:

$ git diff -M --stat --summary master..HEAD

shows me more than the changes above.

You have indeed messed up - there are extraneous merges there. But that's not why your diff fails: your diff probably fails because "master" is ahead of your base, so when you ask for the diff between master and HEAD, you get a diff that contains (the reverse of) everything that I have done that isn't in your tree.

For diffs, you likely want to look at the diff between the "merge base" and your HEAD. Which is what "..." (triple dot) does, so you can probably do

   git diff -M --stat --summary master...HEAD

and it should give you the right thing.

However, I really don't see why you have two extra merges on top of that commit series.

Linus

#2 lore raw

Linus,

Please pull from
git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git docs-move

to get these changes from Michael Witten:

  Documentation/DocBook/drm.tmpl | 308 +++++++++++++++++++++------------------
  drivers/gpu/drm/i915/i915_drv.c|   4 +-
  2 files changed, 170 insertions(+), 142 deletions(-)

---