4
I want to merge user branches into master, however, do some code review & modification before the merge commit.
For example:
o---o---o---o---o master
\
o---o---o lucy
Generally, git merge lucy
will result as:
,-- "Merge commit"
|
o---o---o---o---o---o master
\ /
o---o---o----' lucy
and after code review & modify:
,-- "Merge commit"
| ,-- "Code review: 1) fixed EOL char, 2) apply tabsize=4, ..."
| |
o---o---o---o---o---o---o master
\ /
o---o---o----' lucy
Instead of above, I want to make the merge commit and code-review commit as a single commit:
,-- "Code review & merge: 1) fixed EOL char, 2) apply tabsize=4, ..."
|
o---o---o---o---o---o master
\ /
o---o---o----' lucy
I've tried git merge --no-commit
, however, after then I can't make later commit as a merge-commit.
Any idea?
git-rebase
is probably what you want. – Hello71 – 2011-05-20T01:52:46.683I guess not, I forgot to say: I can't control users' branches. I'm just fetch them and merge into my master. – Xiè Jìléi – 2011-05-20T02:00:13.167