From: Eli Zaretskii <eliz@gnu.org>
To: David Engster <deng@randomsample.de>
Cc: Stromeko@nexgo.de, emacs-devel@gnu.org
Subject: Re: Messing with the VC history
Date: Mon, 17 Nov 2014 18:48:56 +0200 [thread overview]
Message-ID: <83egt1bwnb.fsf@gnu.org> (raw)
In-Reply-To: <87ioifuodn.fsf@engster.org>
> From: David Engster <deng@randomsample.de>
> Cc: Achim Gratz <Stromeko@nexgo.de>, emacs-devel@gnu.org
> Date: Sun, 16 Nov 2014 17:00:20 +0100
>
> > What about "pull --rebase=preserve"? It sounds like a less radical
> > option, did I miss something?
>
> That option only exists since Git 1.8.5 or so. But I agree that it
> should be used if available, as to not accidentally flatten local merges
> you want to keep (you can make it default by setting the pull.rebase
> option to 'preserve' - again something that really should be the
> default).
Btw, those who configure Git to rebase on pull might also wish to set
rebase.stat = true, so the diffstat output is still shown when they
pull.
next prev parent reply other threads:[~2014-11-17 16:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-16 6:17 Messing with the VC history Óscar Fuentes
2014-11-16 8:19 ` Achim Gratz
2014-11-16 15:25 ` Eli Zaretskii
2014-11-16 16:00 ` David Engster
2014-11-17 16:48 ` Eli Zaretskii [this message]
2014-11-16 16:33 ` Achim Gratz
2014-11-16 18:13 ` Eli Zaretskii
2014-11-22 10:04 ` Steinar Bang
2014-11-16 15:24 ` Eli Zaretskii
2014-11-16 16:05 ` Óscar Fuentes
2014-11-16 16:21 ` Eli Zaretskii
2014-11-16 23:33 ` Stephen J. Turnbull
2014-11-17 1:31 ` John Yates
2014-11-17 3:23 ` Stephen J. Turnbull
2014-11-18 7:18 ` Lars Brinkhoff
2014-11-18 7:42 ` David Kastrup
2014-11-18 7:53 ` Stephen J. Turnbull
2014-11-18 8:41 ` David Kastrup
2014-11-18 16:47 ` Barry Warsaw
2014-11-18 17:06 ` Andreas Schwab
2014-11-18 22:30 ` Stephen J. Turnbull
2014-11-19 2:34 ` Stefan Monnier
2014-11-17 16:42 ` Eli Zaretskii
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=83egt1bwnb.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=Stromeko@nexgo.de \
--cc=deng@randomsample.de \
--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.