<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body text="#000000" bgcolor="#FFFFFF">
On 07/19/2012 03:29 AM, Cláudio Silva wrote:
<blockquote
cite="mid:CAE4js0Q4Et4t1i+44F-O8oWEgQN6kf_CariFfZWn0s323L1j6g@mail.gmail.com"
type="cite">
<pre wrap="">Hi,
This is why it is advised to always specify the branches that you are pushing:
git push upstream my_branch:master
I think this explicit definition of branches on git push is always
better, unless you are pushing a lot of branches at the same time.
</pre>
</blockquote>
Actually that was what I did. This usage is described here:<br>
<br>
<meta http-equiv="content-type" content="text/html;
charset=ISO-8859-1">
<a
href="http://wiki.rtems.org/wiki/index.php/Git_Committers#Committing">http://wiki.rtems.org/wiki/index.php/Git_Committers#Committing</a><br>
<br>
The problem was that I specified the wrong "my_branch" and it<br>
didn't have any changes. <br>
<br>
I had actually switched to the branch I was specifying as <br>
my_branch:master. It was just wasn't the branch that actually<br>
had my changes on it. It was a new one with no changes.<br>
<br>
--joel<br>
<br>
<blockquote
cite="mid:CAE4js0Q4Et4t1i+44F-O8oWEgQN6kf_CariFfZWn0s323L1j6g@mail.gmail.com"
type="cite">
<pre wrap="">
Regards,
Cláudio
On Thu, Jul 19, 2012 at 8:02 AM, Thomas Dörfler
<a class="moz-txt-link-rfc2396E" href="mailto:Thomas.Doerfler@embedded-brains.de"><Thomas.Doerfler@embedded-brains.de></a> wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Sebastian,
if this makes sense, can you add this info to the RTEMS Wiki?
Thomas.
On 19.07.2012 08:59, Sebastian Huber wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Hi,
I think one of the most dangerous default settings in Git is the push
strategy:
You can specify what action you want to take in this case, and
avoid seeing this message again, by configuring 'push.default' to:
'nothing' : Do not push anything
'matching' : Push all matching branches (default)
'tracking' : Push the current branch to whatever it is tracking
'current' : Push the current branch
I set it now to 'current'. The mistake from my last week was due to
this default push setting. You can always check that you push the right
commits with "git status".
On 07/18/2012 03:39 PM, Joel Sherrill wrote:
</pre>
<blockquote type="cite">
<pre wrap="">On 07/18/2012 12:50 AM, Thomas Doerfler wrote:
</pre>
<blockquote type="cite">
<pre wrap="">Joel,
just a note: These commit messages do not really look useful :-( We had
that discussion before with different users, so please don't get me
wrong...
</pre>
</blockquote>
<pre wrap="">I know. :(
Apparently git generates them when you merge a branch which has
no changes on it. That seems broken to me.
I accidentally was on the wrong branch and couldn't figure out why
my changes (from another temporary branch) weren't showing up
on the master. The temporary branch I was on had no changes
and this is what got generated.
The other cases were stupid user errors. This was also but why
would git generate a message when there was really nothing
to do?
--joel
</pre>
<blockquote type="cite">
<pre wrap="">wkr,
Thomas.
Am 17.07.2012 23:16, schrieb Joel Sherrill:
</pre>
<blockquote type="cite">
<pre wrap="">Module: rtems
Branch: master
Commit: fac44e12519e401415af7989b80f8a80f7b7de0f
Changeset:
<a class="moz-txt-link-freetext" href="http://git.rtems.org/rtems/commit/?id=fac44e12519e401415af7989b80f8a80f7b7de0f">http://git.rtems.org/rtems/commit/?id=fac44e12519e401415af7989b80f8a80f7b7de0f</a>
Author: Joel Sherrill<a class="moz-txt-link-rfc2396E" href="mailto:joel.sherrill@oarcorp.com"><joel.sherrill@oarcorp.com></a>
Date: Mon Jul 9 11:56:40 2012 -0500
Merge branch 'master' of ssh://git.rtems.org/data/git/rtems
---
_______________________________________________
rtems-vc mailing list
<a class="moz-txt-link-abbreviated" href="mailto:rtems-vc@rtems.org">rtems-vc@rtems.org</a>
<a class="moz-txt-link-freetext" href="http://www.rtems.org/mailman/listinfo/rtems-vc">http://www.rtems.org/mailman/listinfo/rtems-vc</a>
</pre>
</blockquote>
<pre wrap="">
</pre>
</blockquote>
<pre wrap="">
</pre>
</blockquote>
<pre wrap="">
</pre>
</blockquote>
<pre wrap="">
--
--------------------------------------------
Embedded Brains GmbH
Thomas Doerfler Obere Lagerstrasse 30
D-82178 Puchheim Germany
email: <a class="moz-txt-link-abbreviated" href="mailto:Thomas.Doerfler@embedded-brains.de">Thomas.Doerfler@embedded-brains.de</a>
Phone: +49-89-18908079-2
Fax: +49-89-18908079-9
_______________________________________________
rtems-devel mailing list
<a class="moz-txt-link-abbreviated" href="mailto:rtems-devel@rtems.org">rtems-devel@rtems.org</a>
<a class="moz-txt-link-freetext" href="http://www.rtems.org/mailman/listinfo/rtems-devel">http://www.rtems.org/mailman/listinfo/rtems-devel</a>
</pre>
</blockquote>
<pre wrap="">
_______________________________________________
rtems-devel mailing list
<a class="moz-txt-link-abbreviated" href="mailto:rtems-devel@rtems.org">rtems-devel@rtems.org</a>
<a class="moz-txt-link-freetext" href="http://www.rtems.org/mailman/listinfo/rtems-devel">http://www.rtems.org/mailman/listinfo/rtems-devel</a>
</pre>
</blockquote>
<br>
<br>
<pre class="moz-signature" cols="72">--
Joel Sherrill, Ph.D. Director of Research& Development
<a class="moz-txt-link-abbreviated" href="mailto:joel.sherrill@OARcorp.com">joel.sherrill@OARcorp.com</a> On-Line Applications Research
Ask me about RTEMS: a free RTOS Huntsville AL 35805
Support Available (256) 722-9985
</pre>
</body>
</html>