$ git pull --no-ff --no-commit http://people.fedoraproject.org/cgit/kwizart/public_git/mesa.git master
$ do changes
$ git commit -a
$ git push
$
$ git log --format="%s (%an)" --graph
$
* Merge branch 'master' of kwizart/mesa, bump version, add changelog (Igor Gnatenko) |\ | * Enable omx on x86 and arm (Nicolas Chauvet) | * Split _with_xa from _with_vmware (Nicolas Chauvet) | * Add _with_xa when arch is arm and _with_freedreeno (Nicolas Chauvet) |/ * typo fix in file list (Igor Gnatenko) * 10.2-rc1 upstream release (Igor Gnatenko)
- --no-ff: disable fast-forward (force create merge-commit)
- --no-commit: disable make new commit after merge
$ man git merge
$
--no-ff
Create a merge commit even when the merge resolves as a
fast-forward. This is the default behaviour when merging an
annotated (and possibly signed) tag.
· Merge branch maint into the current branch, but do not make a new
commit automatically:
$ git merge --no-commit maint
