top button
Flag Notify
    Connect to us
      Site Registration

Site Registration

How can I do commit by using ".git/MERGE_MSG" without editor after I resolved conflict?

0 votes
888 views

After I resolved conflict, how can I do commit by using ".git/MERGE_MSG" without editor ?

I did like below but It didn't work.

$ cat .git/MERGE_MSG | git commit -m

Is there any way?

posted May 16, 2013 by anonymous

Share this question
Facebook Share Button Twitter Share Button LinkedIn Share Button

1 Answer

0 votes

You can use simple git commit like below in current directory:

 git commit -a
 git commit -m project1
answer Jan 23, 2014 by Amit Kumar Pandey
Similar Questions
+1 vote
How do I modify the commit message (not the topmost one) of a git commit?

I did a series of commits and now I find one of my commit (not the topmost one) has an incorrect commit message. How can I change that specific one? I believe "git commit --amend" works only for the last commit.

0 votes
Remote branch can not be resolved as commit?

I am trying to setup a repository for use inside the LAN, but I have been unable to checkout any branch so far. I am very new to git.

The repository is being served from gitblit over https. I have GIT_SSL_NO_VERIFY=true. The repository was created from git svn.

git ls-remote

shows the remote branches, e.g.:

... refs/remotes/2.0.3
... refs/remotes/trunk

git branch -r

shows none of the remote branches.

git checkout -b new-2.0.3 origin/2.0.3

produces:

fatal: git checkout: updating paths is incompatible with switching branches.
Did you intend to checkout 'origin/2.0.3' which can not be resolved as
commit?

What does that mean? I get the same result after each of these:

git fetch    
git remote update
git fetch

git add remote stage-repo https://example.com:8443/git/blah-tools.git
git fetch stage-repo
git checkout -b new-2.0.3 stage-repo/2.0.3

Can someone explain what the error message means, and what I am doing wrong?

+2 votes
Can I add custom metadata to Git commit object?

Is it possible to add custom metadata to Git commit object?
Such metadata should be ignored by Git commands, but could be used by a 3-party tool which knows the format and knows where to look.

I assume that this should be possible, given that Git objects are actually patches, and patches can contain additional details. But can this be done with the help of Git commands?

0 votes
How to show commit file type attached to a hash code using GIT

I want to show commit related information by the command below.By this, committed files are shown, but names only, off course.But in addition to this, I want to show commit file types (New, Edited, and Deleted).What argument should I use in the command?
git --no-pager show --format=%h%n%an%n%ai%n%s --name-only

...