Re: [Paparazzi-devel] GIT uploading problem

[Leandro Chelini]

Hello Felix

Thank you for the answer.

Now:
I added the remote:
git remote add bruzzlee address@hidden:Bruzzlee/paparazzi.git

I added the remote
git remote add paparazzi git://github.com/paparazzi/paparazzi.git

git push bruzzlee master
To address@hidden:Bruzzlee/paparazzi.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'address@hidden:Bruzzlee/paparazzi.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

git pull paparazzi master
From git://github.com/paparazzi/paparazzi
 * branch            master     -> FETCH_HEAD
Updating 03ba316..81d95ee
Fast-forward
 TODO                                               |  140 ---
 conf/Makefile.lpc21                                |    2 +-
 conf/Makefile.stm32                                |   30 +-
....
....

git reset --hard HEAD^
HEAD is now at 03ba316 Try to ony copy gyro data when it's fresh
(seams it does something but, I can't see any result)


Maybe GIT is not made for that, what I want to do:
- I have a "old" project folder (different version as my fork)
- I want to upload it, so that other interested guys are able to download it.
- Maybe It will be the best way to upload it via ZIP or else

How can I completely reset my fork? (If its possible)
My Idea:
- Reset fork
- Download fork
- change the downloaded fork manually (replace all files locally)
- push the new version

Thanks Bruzzlee

Am 01.04.11 09:53, schrieb Felix Ruess:

Hi,

assuming that the remote named paparazzi points to the main paparazzi
repository, you can't push to it directly since you don't have write
access there. What you want to do is to push to your own fork on
github, probably named Bruzzlee from what you wrote....
So
git push Bruzzlee master

If you made a commit and want to completely throw that last commit
away you can reset your branch to the commit before that one:
git reset --hard HEAD^

If you just want to make a new commit to "undo" the changes of another
commit, e.g. the last one run:
git revert HEAD

http://gitready.com/intermediate/2009/03/16/rolling-back-changes-with-revert.html

Cheers, Felix

On Thu, Mar 31, 2011 at 2:13 PM, Leandro Chelini
<address@hidden> wrote:

Hi all

I want to upload our actual project to git.

What I did:
-  I copied the project from another computer to the "git"-computer
-  cd to/the/preject/dir
-  git push paparazzi master

Then:
error: failed to push some refs to 'paparazzi'

git status:
# On branch master
# Your branch is ahead of 'Bruzzlee/master' by 2 commits.

file
file
file
...
...
...


git commit -m "Change Description"


could it be, that my fork on the git server isn't the same like that one
I've downloaded a moth ago (modified version on my pc)?
I've accidentally deleted everything on my branch. How can I do a "step
back" on git?


thanks Bruzzlee

_______________________________________________
Paparazzi-devel mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/paparazzi-devel

_______________________________________________
Paparazzi-devel mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/paparazzi-devel