[git pull] Documentation: DocBook/drm, basic copyediting

[git pull] Documentation: DocBook/drm, basic copyediting

[Randy Dunlap]

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,
-- 
~Randy

Re: [git pull] Documentation: DocBook/drm, basic copyediting

[Linus Torvalds]

On Wed, Oct 26, 2011 at 11:54 AM, Randy Dunlap <rdunlap@xenotime.net> wrote:
>
> 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

[git pull/retry] Documentation: DocBook/drm, basic copyediting

[Randy Dunlap]

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(-)

---