From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Andrew G Cohen <cohen@andy.bu.edu>
Cc: emacs-devel@gnu.org
Subject: Rebasing (was: [Emacs-diffs] feature/gnus-select 46738e3 040/218: Improve SVG documentation)
Date: Fri, 14 Dec 2018 07:03:08 -0500 [thread overview]
Message-ID: <jwvzht8pbg5.fsf-monnier+emacsdiffs@gnu.org> (raw)
In-Reply-To: <20181214083451.EC1C820538@vcs0.savannah.gnu.org> (Andrew G. Cohen's message of "Fri, 14 Dec 2018 03:34:51 -0500 (EST)")
Hi Andrew,
I see you pushed changes to the gnus-select branch, but in this push
I see many (many) commits and I'm having trouble seeing the ones *you*
made: most of the commits are like the one below.
It looks like you did some kind of rebasing, but in a way that rebased
other people's changes on top of yours rather than the opposite.
Is that indeed that you've done?
Is there a specific reason for that, or was an accident?
Stefan
cohen@andy.bu.edu (Andrew G Cohen) writes:
> branch: feature/gnus-select
> commit 46738e3765ff22f73272ad75c5aea9385de7da33
> Author: Charles A. Roelli <charles@aurox.ch>
> Commit: Andrew G Cohen <cohen@andy.bu.edu>
>
> Improve SVG documentation
>
> * doc/lispref/display.texi (ImageMagick Images): Remove an
> outdated comment that references a fixed bug.
> (SVG Images): Fix grammar, and call functions functions (there are
> no commands in lisp/svg.el).
> ---
> doc/lispref/display.texi | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
> index dcd2fcf..2ac89ba 100644
> --- a/doc/lispref/display.texi
> +++ b/doc/lispref/display.texi
> @@ -5387,7 +5387,6 @@ hint to ImageMagick to help it detect the image type.
> Specifies a rotation angle in degrees.
>
> @item :index @var{frame}
> -@c Doesn't work: https://debbugs.gnu.org/7978
> @xref{Multi-Frame Images}.
> @end table
>
> @@ -5396,8 +5395,8 @@ Specifies a rotation angle in degrees.
> @cindex SVG images
>
> SVG (Scalable Vector Graphics) is an XML format for specifying images.
> -If your Emacs build has with SVG support, you can create and manipulate
> -these images with the following commands.
> +If your Emacs build has SVG support, you can create and manipulate
> +these images with the following functions.
>
> @defun svg-create width height &rest args
> Create a new, empty SVG image with the specified dimensions.
> @@ -5411,7 +5410,7 @@ The default width (in pixels) of any lines created.
> The default stroke color on any lines created.
> @end table
>
> -This function returns an SVG structure, and all the following commands
> +This function returns an SVG structure, and all the following functions
> work on that structure.
> @end defun
>
>
> _______________________________________________
> Emacs-diffs mailing list
> Emacs-diffs@gnu.org
> https://lists.gnu.org/mailman/listinfo/emacs-diffs
next parent reply other threads:[~2018-12-14 12:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20181214083441.4064.68736@vcs0.savannah.gnu.org>
[not found] ` <20181214083451.EC1C820538@vcs0.savannah.gnu.org>
2018-12-14 12:03 ` Stefan Monnier [this message]
2018-12-17 1:32 ` Rebasing Andrew Cohen
2018-12-17 3:43 ` Rebasing Eric Abrahamsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvzht8pbg5.fsf-monnier+emacsdiffs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=cohen@andy.bu.edu \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).