unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: "David González Gándara" <david.gonzalez.gandara@rai.usc.es>
To: David Kastrup <dak@gnu.org>
Cc: Artur Malabarba <bruce.connor.am@gmail.com>,
	emacs-devel <emacs-devel@gnu.org>
Subject: Re: [elpa]: I possibly broke something
Date: Fri, 4 Dec 2015 12:37:00 +0100	[thread overview]
Message-ID: <CAPYXeU4z1RmX7JWMcLrDnM4f=pM+F+abvgJe3_WkyHF-gy86xQ@mail.gmail.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

Thanks for checking. I had never worked in git collaboratelly, I hope I get
used to it soon.

On 3 December 2015 at 21:20, David Kastrup <dak@gnu.org> wrote:

> Artur Malabarba <bruce.connor.am@gmail.com> writes:
>
> > 2015-12-03 17:44 GMT+00:00 David Kastrup <dak@gnu.org>:
> >> How would you check using git-blame that he did not accidentally revert
> >> changes in a bad merge?  Neither the old nor the new lines would be
> >> traced to him.
> >
> > I had already checked (and stated) earlier that he didn't revert
> > anything (with the diffs). Now I just checked whether he had "taken
> > ownership" of any previous changes (with blame).
>
> That's actually neigh impossible for a conflictless merge commit.  git
> blame should not likely attribute anything to the committer of a merge
> but manually resolved merge conflicts.
>
> --
> David Kastrup
>

[-- Attachment #2: Type: text/html, Size: 1449 bytes --]

             reply	other threads:[~2015-12-04 11:37 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04 11:37 David González Gándara [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-12-02 17:17 [elpa]: I possibly broke something mr_rookes
2015-12-02 17:38 ` Michael Heerdegen
2015-12-02  9:59 David González Gándara
2015-12-02 13:04 ` Michael Heerdegen
2015-12-02 23:27 ` Artur Malabarba
2015-12-03 16:58   ` Artur Malabarba
2015-12-03 17:44     ` David Kastrup
2015-12-03 19:52       ` Stefan Monnier
2015-12-03 20:13       ` Artur Malabarba
2015-12-03 20:20         ` David Kastrup

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='CAPYXeU4z1RmX7JWMcLrDnM4f=pM+F+abvgJe3_WkyHF-gy86xQ@mail.gmail.com' \
    --to=david.gonzalez.gandara@rai.usc.es \
    --cc=bruce.connor.am@gmail.com \
    --cc=dak@gnu.org \
    --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).