From: Stephen Berman <stephen.berman@gmx.net>
To: emacs-devel@gnu.org
Subject: git commit/push and VC
Date: Thu, 20 Nov 2014 00:36:29 +0100 [thread overview]
Message-ID: <871toysqyq.fsf@rosalinde.fritz.box> (raw)
I'm still learning how to use git, and have two questions about `git
commit' and `git push'. I've read the "GitForEmacsDevs" page at
emacswiki.org and Conversational Git (recommended on that page), and
unless I'm misunderstanding something (which is not unlikely), they
disagree about what's needed to export changes from one repository to
another, or from one branch to another within a single repository.
Conversational Git say to use `git commit' and then `git push'.
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, I've done
local tests of moving changes between branches and repositories, and
they appear to confirm what Conversational Git says: unless `git push'
follows `git commit', the changes are not available in the other branch
or repositories. So is GitForEmacsDevs wrong or is there something else
going on here?
My second question is about using VC in Emacs. With bzr, typing `C-c
C-c' in the *vc-log* buffer exported my local trunk changes to trunk at
Savannah, because my local trunk was a bound branch. But according to
my local tests, with git typing `C-c C-c' in the *vc-log* buffer only
commits the changes to the checked out branch; they do not show up in
branch or repository the checked out branch was branched from (or its
repository was cloned from). Is this correct? I don't want to
accidentally push changes to master or another branch at Savannah. And
if `C-c C-c' does only do commits on the checked out local branch, it is
possible to use VC to push changes to another branch or repository, and
if so, how?
Steve Berman
next reply other threads:[~2014-11-19 23:36 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-19 23:36 Stephen Berman [this message]
2014-11-20 2:07 ` git commit/push and VC 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
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=871toysqyq.fsf@rosalinde.fritz.box \
--to=stephen.berman@gmx.net \
--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.