[cctbxbb] duplicate spam

[Aaron Brewster]

A few more incoming from another recent experiment.

For what it's worth, I don't like commit squashing as I want the full
history as separate commits.  It's useful to know though.  Thanks,
-Aaron

On Wed, Jul 5, 2017 at 11:19 PM, <markus.gerstel at diamond.ac.uk> wrote:

> Hi Aaron,
>
>
>
> For future reference and maybe of general interest:
>
>
>
> How do I squash many commits in git into one
>
> https://gist.github.com/patik/b8a9dc5cd356f9f6f980
>
>
>
> Can also do it via a Github Pull request by clicking on the small triangle
> within the big green button.
>
> https://github.com/blog/2141-squash-your-commits
>
>
>
> -Markus
>
>
>
> *From:* cctbxbb-bounces at phenix-online.org [mailto:cctbxbb-bounces@
> phenix-online.org] *On Behalf Of *Aaron Brewster
> *Sent:* 06 July 2017 03:34
> *To:* cctbx mailing list <cctbxbb at phenix-online.org>
> *Cc:* CCTBX-COMMIT at jiscmail.ac.uk
> *Subject:* Re: [cctbxbb] duplicate spam
>
>
>
> More commit spam incoming.  This is from merging a bunch of commits from
> an LCLS beamtime into the main branch.
>
> Sorry for the flood.
>
> -Aaron
>
>
>
> On Tue, Jun 27, 2017 at 12:30 AM, Markus Gerstel <
> markus.gerstel at diamond.ac.uk> wrote:
>
> Due to rewriting git history there are now a number of duplicate mails
> coming through here.
>
> Apologies.
>
>
>
> -Markus
>
>
>
> --
>
> This e-mail and any attachments may contain confidential, copyright and or
> privileged material, and are for the use of the intended addressee only. If
> you are not the intended addressee or an authorised recipient of the
> addressee please notify us of receipt by returning the e-mail and do not
> use, copy, retain, distribute or disclose the information in or attached to
> the e-mail.
> Any opinions expressed within this e-mail are those of the individual and
> not necessarily of Diamond Light Source Ltd.
> Diamond Light Source Ltd. cannot guarantee that this e-mail or any
> attachments are free from viruses and we cannot accept liability for any
> damage which you may sustain as a result of software viruses which may be
> transmitted in or with the message.
> Diamond Light Source Limited (company no. 4375679). Registered in England
> and Wales with its registered office at Diamond House, Harwell Science and
> Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom
>
>
>
>
>
>
> --
>
> This e-mail and any attachments may contain confidential, copyright and or
> privileged material, and are for the use of the intended addressee only. If
> you are not the intended addressee or an authorised recipient of the
> addressee please notify us of receipt by returning the e-mail and do not
> use, copy, retain, distribute or disclose the information in or attached to
> the e-mail.
> Any opinions expressed within this e-mail are those of the individual and
> not necessarily of Diamond Light Source Ltd.
> Diamond Light Source Ltd. cannot guarantee that this e-mail or any
> attachments are free from viruses and we cannot accept liability for any
> damage which you may sustain as a result of software viruses which may be
> transmitted in or with the message.
> Diamond Light Source Limited (company no. 4375679). Registered in England
> and Wales with its registered office at Diamond House, Harwell Science and
> Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United Kingdom
>
>
> _______________________________________________
> cctbxbb mailing list
> cctbxbb at phenix-online.org
> http://phenix-online.org/mailman/listinfo/cctbxbb
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://phenix-online.org/pipermail/cctbxbb/attachments/20170710/bbb47e66/attachment.htm>