From: Bill Wohler <wohler@newt.com>
To: emacs-devel@gnu.org
Subject: Re: A simple git workflow for the rest of us
Date: Sun, 16 Nov 2014 11:33:37 -0800 [thread overview]
Message-ID: <87vbmfym7i.fsf@olgas.newt.com> (raw)
In-Reply-To: 87sihkicso.fsf@Rainer.invalid
Achim Gratz <Stromeko@nexgo.de> writes:
> Lars Magne Ingebrigtsen writes:
>> You edit the files in either branch, `M-x vc-dir', and check in your
>> changes. Then you need to push the data to the main repository. This
>> will usually fail, since somebody else has pushed other changes in the
>> meantime. To fix this, say
>>
>> git pull --rebase
>
> When working with upstream this is good practrice, but if you're going
> to do that anyway, just configure your branch with "rebase = true". Or
> configure "autosetuprebase = true" on a repo-wide or global basis so Git
> will do that by default (you can always change that later of course).
That's pull.rebase = true.
Also, do you mean branch.autosetuprebase = always?
I'd second setting it globally to ensure that it happens universally to
avoid the spurious merge commits that otherwise ensue.
Specifically, how does one make a configuration setting that applies to
everyone who clones the repository? Would that setting appear in
emacs/.git/config or elsewhere?
The git config man page says this:
NOTE: this is a possibly dangerous operation; do not use it unless you
understand the implications (see git-rebase(1) for details).
Does our global setting of pushNonFastForward mitigate these concerns?
--
Bill Wohler <wohler@newt.com> aka <Bill.Wohler@nasa.gov>
http://www.newt.com/wohler/
GnuPG ID:610BD9AD
next prev parent reply other threads:[~2014-11-16 19:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-15 16:09 A simple git workflow for the rest of us Lars Magne Ingebrigtsen
2014-11-15 16:38 ` Eli Zaretskii
2014-11-15 17:08 ` Lars Magne Ingebrigtsen
2014-11-16 2:57 ` Ted Zlatanov
2014-11-15 17:43 ` Achim Gratz
2014-11-15 18:04 ` Eli Zaretskii
2014-11-15 17:39 ` Achim Gratz
2014-11-15 17:47 ` Lars Magne Ingebrigtsen
2014-11-15 19:47 ` Karl Fogel
2014-11-16 19:05 ` Bill Wohler
2014-11-22 9:23 ` Steinar Bang
2014-11-22 13:35 ` Lars Magne Ingebrigtsen
2014-11-22 15:00 ` Steinar Bang
2014-11-22 15:26 ` Lars Magne Ingebrigtsen
2014-11-15 18:17 ` Andreas Schwab
2014-11-15 20:20 ` Kelvin White
2014-11-15 20:54 ` Kelvin White
2014-11-16 19:33 ` Bill Wohler [this message]
2014-11-16 19:43 ` Lars Magne Ingebrigtsen
2014-11-16 20:12 ` Ted Zlatanov
2014-11-16 20:19 ` Eli Zaretskii
2014-11-22 9:29 ` Steinar Bang
2014-11-23 18:28 ` Bill Wohler
2014-11-24 15:25 ` Sergey Organov
2014-11-15 19:08 ` Lars Magne Ingebrigtsen
2014-11-15 19:46 ` Andreas Schwab
2014-11-16 14:13 ` Lars Magne Ingebrigtsen
2014-11-16 14:34 ` David Engster
2014-11-16 14:42 ` Lars Magne Ingebrigtsen
2014-11-16 14:50 ` David Engster
2014-11-16 14:54 ` Lars Magne Ingebrigtsen
2014-11-16 15:19 ` David Kastrup
2014-11-16 14:36 ` Achim Gratz
2014-11-16 2:15 ` Glenn Morris
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=87vbmfym7i.fsf@olgas.newt.com \
--to=wohler@newt.com \
--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.