Hi, > it's not the git default because in git we're soppose to work on branches for > features and "more than one commit" bug fixes, All my bug fixes were a single commit. Are we really support to make a branch for that then merge the branch and then commit for a changing in a single file? AFAIK The git flow model doesn't say you need to make a feature branch for a bug fixes.
> then merge without rebasing allows the history to keep track of this set of > changes, it creates a merge commit. Sorry that makes no sense to me. > What you did is only do few commits as part of a bugfix No each commit dealing with a different bug fix. Each commit (some with single file/other with multiple) referred to a single bugfix. > , but because you wasn't working on a branch, when you did git pull Well I only had to do a pull because git doesn't allow you to commit changes in a directory when there are outstanding upstream changes in another directory. > rewrite the commits history to place your commits after mine. Doesn't that then mean that the history is now out of order? Justin
