From: BongHo Lee <techcap@live.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: --no-commit option does not work.
Date: Sun, 26 Mar 2017 23:57:07 +0000 [thread overview]
Message-ID: <CY4PR14MB1238D2E5D35E99405AA8BF61CB300@CY4PR14MB1238.namprd14.prod.outlook.com> (raw)
In-Reply-To: <CY4PR14MB1238A8AC2BFECB56B9B68056CB300@CY4PR14MB1238.namprd14.prod.outlook.com>
Setup
Version : git version 2.12.1.windows.1
OS Version : Microsoft Windows [Version 10.0.14393]
Options
$ cat /etc/install-options.txt
Path Option: Cmd
SSH Option: OpenSSH
CURL Option: OpenSSL
CRLF Option: CRLFCommitAsIs
Bash Terminal Option: MinTTY
Performance Tweaks FSCache: Enabled
Use Credential Manager: Enabled
Enable Symlinks: Disabled
Git Command : git merge --no-commit origin/workingBranch
. What did you expect to occur after running these commands?
merge but no commit.
. What actually happened instead?
commited
Reference URL : https://github.com/techcap/nf-interpreter
Details
I tried to merge from MergeTest to master.
After checking out master, I run below command.
C:\work\nf-interpreter-techcap>git branch
MergeTest
TemplateModification
UpdateBuildInstruction
* master
C:\work\nf-interpreter-techcap>git merge --no-commit origin/MergeTest
Updating 197ad33..028f9f5
Fast-forward
mergeTest.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 mergeTest.txt
C:\work\nf-interpreter-techcap>git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
If I add --no-ff option, it works properly.
I think --no-commit option should be worked without --no-ff.
https://github.com/git-for-windows/git/issues/1102#issuecomment-289206961
next parent reply other threads:[~2017-03-26 23:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CY4PR14MB1238A8AC2BFECB56B9B68056CB300@CY4PR14MB1238.namprd14.prod.outlook.com>
2017-03-26 23:57 ` BongHo Lee [this message]
2017-03-27 5:44 ` --no-commit option does not work Junio C Hamano
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=CY4PR14MB1238D2E5D35E99405AA8BF61CB300@CY4PR14MB1238.namprd14.prod.outlook.com \
--to=techcap@live.com \
--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.
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).