[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: This Is The Git Help Mailing List
|
From: |
Lars Magne Ingebrigtsen |
|
Subject: |
Re: This Is The Git Help Mailing List |
|
Date: |
Thu, 13 Nov 2014 17:19:31 +0100 |
|
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) |
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