Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: [PATCH] Fix incorrect wording in git-merge.txt.

From: Matthieu Moy <hidden>
Date: 2016-06-15 22:44:19

Nicolas Pitre [off-list ref] writes:
You don't really merge a commit _object_.
You merge with one or more other commits, tipycally identified by a 
branch name or a tag.
Strictly speaking, you can merge any commit, not necessarily a branch
or a tag. That can be "git merge 66f0a4d" or whatever. Admitedly, the
common case is to merge a tag or a branch (which is why I keep it in
parentheses).

Now, I don't understand the distinction you seem to be making between
"commit" and "commit object".

-- 
Matthieu
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help