From: David Kastrup <dak@gnu.org>
To: Artur Malabarba <bruce.connor.am@gmail.com>
Cc: "David González Gándara" <david.gonzalez.gandara@rai.usc.es>,
emacs-devel <emacs-devel@gnu.org>
Subject: Re: [elpa]: I possibly broke something
Date: Thu, 03 Dec 2015 18:44:12 +0100 [thread overview]
Message-ID: <87r3j3whoz.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <CAAdUY-JYwo+5E+crQQ4mwP4tUMHNy8b9RNZiDDGhEJXVW0nfDg@mail.gmail.com> (Artur Malabarba's message of "Thu, 3 Dec 2015 16:58:19 +0000")
Artur Malabarba <bruce.connor.am@gmail.com> writes:
> 2015-12-02 23:27 GMT+00:00 Artur Malabarba <bruce.connor.am@gmail.com>:
>> I'm looking at the latest diffs here and it looks like you didn't downgrade
>> anything.
>>
>> On 2 Dec 2015 9:59 am, "David González Gándara"
>> <david.gonzalez.gandara@rai.usc.es> wrote:
>>>
>>> I'm sorry about my unexpertise with git. I tried to merge my local changes
>>> with the ones Stefan Monnier's did fixing my package and I think I may have
>>> downgraded other changes.
>
> Just to ease your mind, David. I just checked git-blame and you most
> certainly did not screw anything up. ;-)
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.
To check, you would rather use git-diff from before the merge on the
master branch to after the merge: that should only show his own work.
--
David Kastrup
next prev parent reply other threads:[~2015-12-03 17:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 9:59 [elpa]: I possibly broke something 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 [this message]
2015-12-03 19:52 ` Stefan Monnier
2015-12-03 20:13 ` Artur Malabarba
2015-12-03 20:20 ` David Kastrup
-- strict thread matches above, loose matches on Subject: below --
2015-12-02 17:17 mr_rookes
2015-12-02 17:38 ` Michael Heerdegen
2015-12-04 11:37 David González Gándara
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r3j3whoz.fsf@fencepost.gnu.org \
--to=dak@gnu.org \
--cc=bruce.connor.am@gmail.com \
--cc=david.gonzalez.gandara@rai.usc.es \
--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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.