From: Lars Magne Ingebrigtsen <larsi@gnus.org>
To: emacs-devel@gnu.org
Subject: Re: This Is The Git Help Mailing List
Date: Thu, 13 Nov 2014 17:19:31 +0100 [thread overview]
Message-ID: <m3mw7vf4z0.fsf@stories.gnus.org> (raw)
In-Reply-To: m3sihnf5jy.fsf@stories.gnus.org
D'oh. Me stupid.
I had just forgotten to commit the ChangeLog change, which is why it was
complaining about "unstaged" things.
And having this in emacs/.gitattributes helps a lot:
ChangeLog merge=merge-changelog
You need to install the merge-changlog thingie from somewhere, though.
I think. It's been a while since I fiddled with this.
With that in place, "git pull --rebase; git push" worked perfectly.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2014-11-13 16:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-13 16:06 This Is The Git Help Mailing List Lars Magne Ingebrigtsen
2014-11-13 16:19 ` Lars Magne Ingebrigtsen [this message]
2014-11-13 17:04 ` Eli Zaretskii
2014-11-13 17:19 ` Andreas Schwab
2014-11-13 17:38 ` Eli Zaretskii
2014-12-05 0:45 ` Juri Linkov
2014-12-05 2:04 ` Stefan Monnier
2014-12-05 4:26 ` Ted Zlatanov
2014-12-05 16:03 ` Rüdiger Sonderfeld
2014-12-05 15:59 ` Rüdiger Sonderfeld
2014-11-13 16:20 ` Karl Fogel
2014-11-13 17:24 ` Paul Eggert
2014-11-13 17:30 ` Lars Magne Ingebrigtsen
2014-11-13 16:21 ` Andreas Schwab
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=m3mw7vf4z0.fsf@stories.gnus.org \
--to=larsi@gnus.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 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.