[SR-Dev] git:henning/trie_mods: Merge commit 'origin/henning/trie'

Henning Westerholt henning.westerholt at 1und1.de
Thu Nov 27 17:58:37 CET 2008

On Thursday 27 November 2008, Henning Westerholt wrote:
> Module: sip-router
> Branch: henning/trie_mods
> Commit: ecaca6b8fc03cdc0a0668175719dcba5ae3fe280
> URL:   
> http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecaca6b
> Author: Henning Westerholt <henning.westerholt at 1und1.de>
> Committer: Henning Westerholt <henning.westerholt at 1und1.de>
> Date:   Thu Nov 27 14:00:30 2008 +0100
> Merge commit 'origin/henning/trie'
> * commit 'origin/henning/trie':
>   add trie to library directory
>   add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h

Aaaaaaahrg, this git is killing me. :-/ I just want to start a new branch from 
the master with:

git push --dry-run --verbose origin origin:refs/heads/henning/trie_mods
Pushing to ssh://git.sip-router.org/sip-router
To ssh://git.sip-router.org/sip-router
 * [new branch]      origin/HEAD -> henning/trie_mods

This looked ok, and trie_mods branch is now created, but now i've made 
probably another mistake. Andrei, can you perhaps reset the master again? Why 
i got the same log message now? Also an issue with my git installation? I'll 
tomorrow update my system, this can not continue this way. :-(

Sorry about this,


More information about the sr-dev mailing list