From: Uwe Brauer <oub@mat.ucm.es>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Uwe Brauer <oub@mat.ucm.es>, git <git@vger.kernel.org>
Subject: Re: I just pulled, and git log --graph does not show all
Date: Wed, 09 Oct 2019 17:06:19 +0300 [thread overview]
Message-ID: <87a7aaovxg.fsf@mat.ucm.es> (raw)
In-Reply-To: 20191009132345.GH29845@szeder.dev
[-- Attachment #1: Type: text/plain, Size: 703 bytes --]
> Anyway, in your first email you asked how you can merge that branch
> into 'master'. The command 'git merge origin/strings' will "merge" it
> without actually creating a merge commit, because 'strings' builds
> entirely on top of 'master'; this is what Git calls a "fast-forward
> merge". If you do want a merge commit, then run 'git merge --no-ff
> origin/strings'.
Interestingly enough it is impossible in mercurial to have a (not ff)
merge in mercurial in this situation, because you have only one head
(linear history) and two bookmarks. That is one thing I dislike in
mercurial, but it can be easily avoided by using named branches or
topics, but any way this is off topic.
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5025 bytes --]
prev parent reply other threads:[~2019-10-09 14:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-24 10:22 I just pulled, and git log --graph does not show all Uwe Brauer
2019-10-08 23:01 ` SZEDER Gábor
2019-10-09 6:13 ` Uwe Brauer
2019-10-09 12:33 ` Derrick Stolee
2019-10-09 13:23 ` SZEDER Gábor
2019-10-09 13:36 ` Uwe Brauer
2019-10-09 14:06 ` Uwe Brauer [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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a7aaovxg.fsf@mat.ucm.es \
--to=oub@mat.ucm.es \
--cc=git@vger.kernel.org \
--cc=szeder.dev@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 public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).