On Nov 1, 2014, at 4:44 AM, Gilles Gouaillardet <[email protected]>
wrote:
> I am sorry about that, the doc is not to be blamed here.
> I usually do pull/commit/push in a row to avoid this kind of things but i
> screwed up this time ...
> I cannot remember if i did commit/pull/push or if i simply forgot to pull
FWIW, to avoid this kind of stuff, I usually do the following:
-----
$ cat ~/.gitconfig
[user]
name = Jeff Squyres
email = [email protected]
[alias]
pr = pull --rebase
...etc.
-----
I then always use "git pr" instead of "git pull".
> btw, is there a push option to abort if that would make github history non
> linear ?
I'm not aware of one.
--
Jeff Squyres
[email protected]
For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/
