Here is an excerpt from git push examples
(
http://www.kernel.org/pub/software/scm/git/docs/git-push.html). It matches your initial
command.
"git push origin master:satellite/master dev:satellite/dev
Use the source ref that matches master (e.g. refs/heads/master) to update the ref that
matches satellite/master (most probably refs/remotes/satellite/master) in the origin
repository, then do the same for dev and satellite/dev."
So when you used "git push origin release-3.0.0:origin/release-3.0.0" you pushed
your tree to origin/release-3.0.0 (not release-3.0.0). Apparently the remote branch had
already most of the changes from your local release-3.0.0 (with the exception of those
14). It will require more digging/expertise to uncover the history behind
origin/release-3.0.0. All in all, I do not see how you could have affected release-3.0.0
with that wrong push command.
PS: You can use "git checkout origin/release-3.0.0" to see/use the branch that
got the 14 updates. I use gitk to see the history tree in a nice format.
Thank you,
Stefan Negrea
Software Engineer
----- Original Message -----
From: "Simeon Pinder" <spinder(a)redhat.com>
To: rhq-devel(a)lists.fedorahosted.org
Sent: Thursday, June 2, 2011 9:36:44 AM
Subject: Re: Need help understanding erroneous git commit
Thx. Agreed Mazz. That's exactly how I committed to the right branch "git push
origin release-3.0.0" afterward. I'm more concerned with figuring out and fixing
the erroneous commit so as not to introduce other issues.
-Simeon
----- Original Message -----
From: "John Mazzitelli" <mazz(a)redhat.com>
To: rhq-devel(a)lists.fedorahosted.org
Sent: Thursday, June 2, 2011 10:27:40 AM
Subject: Re: Need help understanding erroneous git commit
On 06/02/2011 10:23 AM, Simeon Pinder wrote:
git push origin release-3.0.0:origin/release-3.0.0
I'm not a git guru, but I can tell you that isn't the syntax I use. I
don't know what "release-3.0.0:origin/release-3.0.0" did here.
Whenever I push, I always push a tracking branch whose name is the same
as the origin/ branch. In my case (and with yours it seems), you have a
tracking branch called "release-3.0.0" which tracks the remote
"origin/release-3.0.0".
To push, just do this:
"git push origin release-3.0.0"
If you are not sure about git commands to issue, stay away from the
command line. Just use "git gui". "git gui" is great, and its very
easy
to use, you typically can't go wrong doing simple things like committing
and pushing.
I would recommend you use "git gui" from now on for the basics. Fall
back to the command line if you have more complicating things to do.
_______________________________________________
rhq-devel mailing list
rhq-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/rhq-devel
_______________________________________________
rhq-devel mailing list
rhq-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/rhq-devel