[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git commit/push and VC
From: |
Stephen Berman |
Subject: |
Re: git commit/push and VC |
Date: |
Fri, 21 Nov 2014 11:34:20 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
On Thu, 20 Nov 2014 17:45:36 +0200 Eli Zaretskii <address@hidden> wrote:
>> Date: Thu, 20 Nov 2014 10:29:30 +0700
>> From: Yuri Khan <address@hidden>
>> Cc: Emacs developers <address@hidden>
>>
>> > GitForEmacsDevs says this:
>> >
>> > If you are a committer, you can merge to the upstream master directly.
>> >
>> > First, update your repository:
>> >
>> > cd $DEVHOME/emacs
>> > git checkout master
>> > git pull
>> > git merge TASKNAME
>> > git push
>> >
>> > Run the tests:
>> >
>> > make check
>> >
>> > and then commit
>> >
>> > git status
>> > git commit -m "fixes debbugs:12345"
>> >
>> > which merges all your new commits to the upstream master.
>> >
>> > I don't understand why `git commit' follows `git push' here (or why
>> > there isn't another `git push' after `git commit').
>>
>> Indeed, the instruction quoted above is strange.
>
> These instructions were simply wrong. You will see that I raised some
> of these issues as early as last January:
>
> http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg00790.html
>
> but nothing was done about that.
>
> I now fixed the instructions as best I could; please read and comment.
The only comment I'm qualified to make is: it's much clearer now, thanks.
Steve Berman
- Re: git commit/push and VC, (continued)
- Re: git commit/push and VC, Thien-Thi Nguyen, 2014/11/21
- Re: git commit/push and VC, Eli Zaretskii, 2014/11/21
- Re: git commit/push and VC, Eli Zaretskii, 2014/11/22
- Re: git commit/push and VC, David Kastrup, 2014/11/22
- Re: git commit/push and VC, Eli Zaretskii, 2014/11/22
- Re: git commit/push and VC, Eli Zaretskii, 2014/11/22
- Re: git commit/push and VC, David Kastrup, 2014/11/22
- Re: git commit/push and VC,
Stephen Berman <=