git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7bb76bc 29c81d9)
Merge master into v3-6-test
authorKarolin Seeger <kseeger@samba.org>
Wed, 16 Mar 2011 19:34:44 +0000 (20:34 +0100)
committerKarolin Seeger <kseeger@samba.org>
Wed, 16 Mar 2011 19:35:02 +0000 (20:35 +0100)
This merge was done by:
git reset --hard origin/master
git merge -s ours origin/v3-6-test
git show origin/v3-6-test:source3/VERSION > source3/VERSION
git commit -a --amend

This basicly resets v3-6-test to master,
but it keeps the v3-6-test history as a merge commit.

metze


Trivial merge
Work in progress branches