From: Stephen Berman <stephen.berman@gmx.net>
To: Eli Zaretskii <eliz@gnu.org>
Cc: emacs-devel@gnu.org, Yuri Khan <yuri.v.khan@gmail.com>
Subject: Re: git commit/push and VC
Date: Fri, 21 Nov 2014 11:34:20 +0100 [thread overview]
Message-ID: <87lhn4n8pf.fsf@rosalinde.fritz.box> (raw)
In-Reply-To: <838uj57u5b.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 20 Nov 2014 17:45:36 +0200")
On Thu, 20 Nov 2014 17:45:36 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Thu, 20 Nov 2014 10:29:30 +0700
>> From: Yuri Khan <yuri.v.khan@gmail.com>
>> Cc: Emacs developers <emacs-devel@gnu.org>
>>
>> > 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
prev parent reply other threads:[~2014-11-21 10:34 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 23:36 git commit/push and VC Stephen Berman
2014-11-20 2:07 ` Glenn Morris
2014-11-20 12:28 ` Stephen Berman
2014-11-20 3:29 ` Yuri Khan
2014-11-20 15:45 ` Eli Zaretskii
2014-11-20 18:17 ` Achim Gratz
2014-11-20 20:59 ` Eli Zaretskii
2014-11-21 0:31 ` Stephen J. Turnbull
2014-11-21 9:01 ` Eli Zaretskii
2014-11-22 5:30 ` Stephen J. Turnbull
2014-11-22 5:50 ` Yuri Khan
2014-11-22 7:17 ` Stephen J. Turnbull
2014-11-22 6:50 ` Ivan Shmakov
2014-11-22 7:25 ` Stephen J. Turnbull
2014-11-22 7:42 ` Ivan Shmakov
2014-11-22 8:59 ` Stephen J. Turnbull
2014-11-22 8:36 ` Eli Zaretskii
2014-11-22 8:37 ` Andreas Schwab
2014-11-22 8:50 ` Ivan Shmakov
2014-11-22 8:35 ` Eli Zaretskii
2014-11-22 9:36 ` Stephen J. Turnbull
2014-11-22 10:25 ` Eli Zaretskii
2014-11-22 11:31 ` Andreas Schwab
2014-11-22 12:37 ` Eli Zaretskii
2014-11-22 13:00 ` Andreas Schwab
2014-11-22 13:45 ` Eli Zaretskii
2014-11-22 14:12 ` Andreas Schwab
2014-11-22 15:20 ` Eli Zaretskii
2014-11-21 8:23 ` martin rudalics
2014-11-21 9:06 ` Eli Zaretskii
2014-11-21 9:40 ` Dani Moncayo
2014-11-21 10:24 ` martin rudalics
2014-11-21 10:40 ` Eli Zaretskii
2014-11-21 8:49 ` Thien-Thi Nguyen
2014-11-21 9:12 ` Eli Zaretskii
2014-11-22 10:30 ` Eli Zaretskii
2014-11-22 10:43 ` David Kastrup
2014-11-22 11:01 ` Eli Zaretskii
2014-11-22 11:16 ` Eli Zaretskii
2014-11-22 11:22 ` David Kastrup
2014-11-21 10:34 ` Stephen Berman [this message]
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=87lhn4n8pf.fsf@rosalinde.fritz.box \
--to=stephen.berman@gmx.net \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=yuri.v.khan@gmail.com \
/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.