Git: after preparing a real merge commit, how to create a simple commit?

Posted by mklhmnn on Stack Overflow See other posts from Stack Overflow or by mklhmnn
Published on 2010-06-14T15:20:56Z Indexed on 2010/06/14 15:22 UTC
Read the original article Hit count: 256

Filed under:

git

|

git-merge

After invoking git merge --no-commit <commit>, performing a commit will result in a merge commit with two (or more) parents. What command to invoke to create a simple commit instead (without having to re-perform the merge command with the --squash option)?

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about git-merge

How Do I 'git fetch' and 'git merge' from a Remote Tracking Branch (like 'git pull')

as seen on Stack Overflow - Search for 'Stack Overflow'
I have set up some remote tracking branches in git, but I never seem to be able to merge them into the local branch once I have updated them with 'git fetch'. For example, suppose I have remote branch called 'an-other-branch'. I set that up locally as a tracking branch using git branch --track an-other-branch… >>> More
TeamCity and pending Git merge branch commit keeps build with failed tests

as seen on Stack Overflow - Search for 'Stack Overflow'
We use TeamCity for continuous integration and Git for source control. Generally it works pretty well - convenient, modern and good us quick feedback when tests fails. There is a strange behavior related to Git merge specifics. Here are steps of the case: First developer pulls from master repo… >>> More
git merge should ignore one directory

as seen on Stack Overflow - Search for 'Stack Overflow'
I have tons of data in directory called reports. While doing git merge with another branch I am getting lots of conflicts for files under reports directory. I would like git merge to ignore files under reports. In another words I would like all the data from reports from master and not from lab branch… >>> More
Git merge command

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm reading the following article: http://github.com/guides/keeping-a-git-fork-in-sync-with-the-forked-repo, where they mention essentially pulling in changes from two repos at the same time by creating the following alias: pu = !"git fetch origin -v; git fetch wycats -v; git merge wycats/master" This… >>> More
Git merge of same and externally modified file

as seen on Stack Overflow - Search for 'Stack Overflow'
I have inherited some code (from zip file) from a developer and git initialzed, made changes and set of check-ins progressively. Now, the same developer released the same code with his changes and gave me the another zip file. How do i merge my changes which i have it my git repo and his recent… >>> More