Re: Work is not replayed on top while: git pull -v --rebase

2018-09-25 Thread KES
The commits are lost always if both users did `git push --force` How to reproduce: 1. First user: `git push --force` 2. Second user: `git push --force` 3. First user: `git pull -v --rebase` Here after 3 I expect that git will say that after rebase some commits from current branch will not be

Re: Work is not replayed on top while: git pull -v --rebase

2018-09-25 Thread KES
As you can see I have lost some commits. Thus I wanna an option to be safe 20.09.2018, 17:38, "Junio C Hamano" : > KES writes: > >>  PS. for `git push --force` there is alternative: --force-with-lease >>  Is there something similar to --force-with-lease but for `git pull -v >> --rebase`? > >

Re: Work is not replayed on top while: git pull -v --rebase

2018-09-20 Thread Junio C Hamano
KES writes: > PS. for `git push --force` there is alternative: --force-with-lease > Is there something similar to --force-with-lease but for `git pull -v > --rebase`? Curious. For "push", you are competing with the other pushers who want to update the repository over there, and there is need

Work is not replayed on top while: git pull -v --rebase

2018-09-20 Thread KES
Hi. TL;DR; Some local commits are lost while `git pull -v --rebase` [alias] tree= log --graph --decorate --pretty=oneline --abbrev-commit changes = log --graph --decorate --pretty=oneline --abbrev-commit --cherry-pick --boundary --left-right $ git fetch origin remote: