[sr-dev] git:master:3ee47957: Merge branch 'master' of https://github.com/kamailio/kamailio

[Olle E. Johansson]

On 05 Feb 2015, at 21:11, Victor Seva <linuxmaniac at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 670 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.sip-router.org/pipermail/sr-dev/attachments/20150205/a875bdf3/attachment.sig>