On 05 Feb 2015, at 21:11, Victor Seva linuxmaniac@torreviejawireless.org wrote:
On 02/05/2015 08:36 PM, Luis Azedo wrote:
Merge branch 'master' of https://github.com/kamailio/kamailio
Please Luis, before push do a git rebase. We're trying to avoid this kind of things in the git history.
I had a hard time learning this too. Finally made this script:
$ cat /usr/local/bin/gitpull #!/bin/sh git pull --ff --rebase origin
/O