[no subject]

If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:

    branch..remote = <nickname>
    branch..merge = <remote-ref>
    remote.<nickname>.url = <url>
    remote.<nickname>.fetch = <refspec>

See git-config(1) for details.
drtv narayana:~/git/gnome-control-center/po$


-- 
My blogs: [all in Tamil]
http://anmikam4dumbme.blogspot.com/
http://chitirampesuthati.blogspot.com/ photo blog now with english text too!
http://kathaikathaiyaam.blogspot.com/

BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY!

--0016e65b617e2eec9204769c3ef2
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

ever since the master shifted to 2.30 i am having this problem.<br>same thi=
ng happens for several files.<br>i am sick of recloning.<br>pl tell me what=
 to do.<br>tia<br><a href=3D"http://dr.tv";>dr.tv</a><br><br>--<br>drtv nara=
yana:~/git/gnome-control-center/po$ git up<br>

remote: Counting objects: 12, done.<br>remote: Compressing objects: 100% (7=
/7), done.<br>Unpacking objects: 100% (7/7), done.<br>remote: Total 7 (delt=
a 5), reused 0 (delta 0)<br>From ssh://<a href=3D"http://vasudeven git gnom=
e.org/git/gnome-control-center">vasudeven git gnome org/git/gnome-control-c=
enter</a><br>

=C2=A0=C2=A0 2d5a4a9..80b0976=C2=A0 gnome-2-28 -&gt; origin/gnome-2-28<br>=
=C2=A0=C2=A0 0c5b06f..3223742=C2=A0 master=C2=A0=C2=A0=C2=A0=C2=A0 -&gt; or=
igin/master<br>You asked me to pull without telling me which branch you<br>=
want to merge with, and &#39;branch..merge&#39; in<br>

your configuration file does not tell me either.=C2=A0 Please<br>name which=
 branch you want to merge on the command line and<br>try again (e.g. &#39;g=
it pull &lt;repository&gt; &lt;refspec&gt;&#39;).<br>See git-pull(1) for de=
tails on the refspec.<br>

<br>If you often merge with the same branch, you may want to<br>configure t=
he following variables in your configuration<br>file:<br><br>=C2=A0=C2=A0=
=C2=A0 branch..remote =3D &lt;nickname&gt;<br>=C2=A0=C2=A0=C2=A0 branch..me=
rge =3D &lt;remote-ref&gt;<br>=C2=A0=C2=A0=C2=A0 remote.&lt;nickname&gt;.ur=
l =3D &lt;url&gt;<br>

=C2=A0=C2=A0=C2=A0 remote.&lt;nickname&gt;.fetch =3D &lt;refspec&gt;<br><br=
>See git-config(1) for details.<br>drtv narayana:~/git/gnome-control-center=
/po$ <br><br clear=3D"all"><br>-- <br>My blogs: [all in Tamil]<br><a href=
=3D"http://anmikam4dumbme.blogspot.com/";>http://anmikam4dumbme.blogspot.com=
/</a><br>

<a href=3D"http://chitirampesuthati.blogspot.com/";>http://chitirampesuthati=
.blogspot.com/</a> photo blog now with english text too!<br><a href=3D"http=
://kathaikathaiyaam.blogspot.com/">http://kathaikathaiyaam.blogspot.com/</a=
><br>

<br>BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY!<br>

--0016e65b617e2eec9204769c3ef2--