Rebasing (was: [Emacs-diffs] feature/gnus-select 46738e3 040/218: Improve SVG documentation)

Rebasing (was: [Emacs-diffs] feature/gnus-select 46738e3 040/218: Improve SVG documentation)

[Stefan Monnier]

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

Re: Rebasing

[Andrew Cohen]

Following my blunder in trying to update the feature/gnus-select branch,
Stefan has helped me restore things to a sane state. Since this branch
was so far out of sync with master, I ended up creating a new branch,
feature/gnus-select2, with may changes rebased off of master from a few
days ago. I'll delete the obsolete feature/gnus-select branch shortly.

Sorry for the trouble.

Re: Rebasing

[Eric Abrahamsen]

Andrew Cohen <cohen@bu.edu> writes:

> Following my blunder in trying to update the feature/gnus-select branch,
> Stefan has helped me restore things to a sane state. Since this branch
> was so far out of sync with master, I ended up creating a new branch,
> feature/gnus-select2, with may changes rebased off of master from a few
> days ago. I'll delete the obsolete feature/gnus-select branch shortly.

I'm looking forward to seeing this land!