From: Johannes Sixt <j6t@kdbg.org>
To: Git Mailing List <git@vger.kernel.org>
Subject: git-gui is still using old-style git-merge invocation
Date: Thu, 29 Oct 2015 18:50:16 +0100 [thread overview]
Message-ID: <56325C58.1060007@kdbg.org> (raw)
Performing a merge with git gui presents the following message in the
merge result window:
warning: old-style 'git merge <msg> HEAD <commit>' is deprecated.
Merge made by the 'recursive' strategy.
a | 1 +
1 file changed, 1 insertion(+)
create mode 100644 a
But I am unable to find where the invocation happens. Can somebody help?
-- Hannes
PS: Reproducer:
git init
echo a > a
git add a
git commit -ma a
git checkout -b side @~
echo b > b
git add b
git commit -mb
git gui # to merge: Ctrl-M, Enter, Enter
next reply other threads:[~2015-10-29 17:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-29 17:50 Johannes Sixt [this message]
2015-10-29 17:56 ` git-gui is still using old-style git-merge invocation Dennis Kaarsemaker
2015-10-29 19:31 ` Johannes Sixt
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=56325C58.1060007@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.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.
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 NNTP newsgroup(s).