You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@deltacloud.apache.org by "marios@redhat.com" <ma...@redhat.com> on 2012/02/10 14:00:17 UTC

Re: [1/2] git commit: Merge branches 'master' and 'DTACLOUD_135'

On 10/02/12 14:51, marios@apache.org wrote:
> Updated Branches:
>   refs/heads/master 0fc7be231 -> db37db48e
> 
> 
> Merge branches 'master' and 'DTACLOUD_135'
> 

sorry about this - trying to (again) get used to:

git checkout master; git pull
git checkout branch
git rebase -i master
git checkout master
git merge branch
git push


rather than:

git checkout master; git svn rebase
git rebase master branch
git checkout branch
git svn dcommit

(thanks michal for assistance with the brainfrag)

marios

> 
> Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
> Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/db37db48
> Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/db37db48
> Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/db37db48
> 
> Branch: refs/heads/master
> Commit: db37db48e14d5a9b83cb2c7a501fdafd21b39635
> Parents: 9fafb55
> Author: marios <ma...@redhat.com>
> Authored: Fri Feb 10 14:50:27 2012 +0200
> Committer: marios <ma...@redhat.com>
> Committed: Fri Feb 10 14:50:27 2012 +0200
> 
> ----------------------------------------------------------------------
> 
> ----------------------------------------------------------------------
> 
>