[Owncloud] Git problems
Thomas Olsen
thomas at tanghus.net
Mon Jan 2 13:46:48 UTC 2012
I'm having some problems wrapping my Swiss cheese brain around git :-/
Whenever I run "git status" in master I get:
# On branch master
# Your branch is ahead of 'origin/master' by 65 commits.
So I tried to run:
git fetch --all
git pull --rebase git://gitorious.org/owncloud/owncloud.git
git push git at gitorious.org:~tanghus/owncloud/tanghus-owncloud.git
Apparently that is not the solution...
Running "git remote show origin" gives:
* remote origin
Fetch URL: git at gitorious.org:~tanghus/owncloud/tanghus-owncloud.git
Push URL: git at gitorious.org:~tanghus/owncloud/tanghus-owncloud.git
HEAD branch: master
Remote branches:
ace-editor tracked
ajax tracked
calendar tracked
contact_thumbnails tracked
database tracked
encryption tracked
file_sync_server tracked
fileactions-css tracked
filesystem tracked
fullcalendar tracked
gallery tracked
json-notification tracked
master tracked
media_player tracked
oc_image tracked
stable tracked
sync tracked
tanghus_contacts tracked
tanghus_remote_backup tracked
tasks tracked
Local branches configured for 'git pull':
contact_thumbnails merges with remote contact_thumbnails
master merges with remote master
tanghus_remote_backup merges with remote tanghus_remote_backup
Local refs configured for 'git push':
contact_thumbnails pushes to contact_thumbnails (up to date)
master pushes to master (up to date)
oc_image pushes to oc_image (up to date)
tanghus_contacts pushes to tanghus_contacts (up to date)
tanghus_remote_backup pushes to tanghus_remote_backup (up to date)
What is the 'proper' way to keep both my local and remote master in sync with
git://gitorious.org/owncloud/owncloud.git ?
All the tutorials I read about git seems to add to my confusion...
--
Med venlig hilsen / Best Regards
Thomas Tanghus
More information about the Owncloud
mailing list