Matthieu Moy wrote:
>> This is exactly the same in Git. You really only ever push upstream
>> when your local changes fast forward the remote, (ie. you're up to date).
>> Git will warn you if your changes don't fast forward the remote.
>
> Yes, but you will have to do a merge at some point, right ? While I'm
> keeping a purely linear history (not that it is good in the general
> case, but for "projects" on which I'm the only developper, I find it
> good. For example, my ${HOME}/etc/).
Fast-forward doesn't result in merge.
If you have
1---2---3 <branch 1, or branch locally>
\
4---5 <branch 2, or branch at remote>
then this is fast-forward case. After pull (or push) you have
1---2---3---4---5 <branch 1>
without merge.
--
Jakub Narebski
Poland
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html