24 Nov
2008
24 Nov
'08
8:46 p.m.
On Monday 24 November 2008, Andrei Pelinescu-Onciul wrote:
Hi Andrei,
i'm still trying to wrap my head around this git. ;-) Aparently this merged
the content from the henning/trie branch into the trunk, the operation i
wanted to do. But i don't understand the log message, 'my_branch' is a local
branch on my machine, not sure why this show up, and it should be also the
other way round. And the diff for the revision is also the other way round.
Perhaps i just did it the wrong way. :-/
henning@ca:~/projects/openser/sip-router$ git config --get merge.log
true
Perhaps it make sense to revert this commit?
Cheers,
Henning
On Nov 24, 2008 at 19:29, Henning Westerholt
<henning.westerholt(a)1und1.de>
wrote:
Module:
sip-router
Branch: master
Commit: 8d41196809f014e00346785b6517bd2c4051901a
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d411
96809f014e00346785b6517bd2c4051901a
Author: Henning Westerholt <henning.westerholt(a)1und1.de>
Committer: Henning Westerholt <henning.westerholt(a)1und1.de>
Date: Mon Nov 24 19:13:59 2008 +0100
Merge ssh://git.sip-router.org/sip-router into my_branch
That should have been:
Merge commit 'origin/henning/trie' into master
* commit 'origin/henning/trie':
add trie to library directory
add SHM_MEM_ERROR and PKG_MEM_ERROR logging macros to mem.h
Henning did you forgot to set merge log to true in your git config
(~/.gitconfig or per repository in .git/config)?
( git config --get merge.log # to see it's value
git config --global merge.log true # to set it to true)