[SCM] Samba Shared Repository - branch master updated - 60164e9002c28911dbfd7115cb9bff05be5aff25

Derrell Lipman derrell.lipman at unwireduniverse.com
Thu Oct 23 12:39:39 GMT 2008

On Wed, Oct 22, 2008 at 10:58 PM, Jelmer Vernooij <jelmer at samba.org> wrote:

> - Log -----------------------------------------------------------------
> commit 60164e9002c28911dbfd7115cb9bff05be5aff25
> Merge: 391ce30d497503ce998d0c5dbab9ea7d4fe3ed3b
> 596089ec06b0a2b2ec3e0e5bd6d46c2e767bd954
> Author: Jelmer Vernooij <jelmer at samba.org>
> Date:   Thu Oct 23 04:58:08 2008 +0200
>    Merge branch 'master' of ssh://git.samba.org/data/git/samba

Sometimes git merges by adding each commit that was done, while other times,
like here, it adds just a single entry to the git-log showing that a merge
was done, but with no detail.  Is it possible to control that and force a
merge with all commits being merged to be added independently?


More information about the samba-technical mailing list