Although I still lack a lot of git knowledge and not sure I do stuff in the best way, but just in case is useful for anyone, before git push, I do:
git pull --stat --ff --rebase origin
I actually added an alias inside ~/.gitconfig to make it shorter and easy to remember:
[alias] pullx = pull --stat --ff --rebase
and now I just do:
git pullx origin
Some other aliases I have:
[alias] ci = commit co = checkout pullx = pull --stat --ff --rebase pickx = cherry-pick -x logp = log -p logf = log --follow logfp = log -p --follow logpf = log -p --follow
Cheers, Daniel
On 16.10.17 13:30, Juha Heinanen wrote:
Victor Seva writes:
rebase before pushing
This is what I did (taken from shell history):
2060 emacs sipdump_mod.c 2061 git diff 2062 git commit -a 2063 git push 2064 git pull 2065 git push
If I remember correctly, first git push failed with message asking to do pull first, which I did and then pushed again.
What would have been the correct command sequence provided that I didn't remember to do 'git rebase'?
-- Juha
Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev