--===============4726118588958919111== Content-Type: multipart/alternative; boundary="Boundary-01=_XVwlPyhkCVxUEwH" Content-Transfer-Encoding: 7bit --Boundary-01=_XVwlPyhkCVxUEwH Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Em Tuesday 24 April 2012, Martin Gr=C3=A4=C3=9Flin escreveu: > Am 24.04.2012 20:08, schrieb Lamarque V. Souza: > > I usually do that, this time I did a "git merge" and forgot to do a > >=20 > > "git > > commit --amend" afterwards. >=20 > You actually caused a merge commit. That's not needed at all. > You could do a: > git checkout master > git pull > git checkout topicBranch > git rebase master > git merge topicBranch >=20 > That way no merge commit is added. It's not so interesting to know how > the topicBranch had been called on your local installation and it puts > all commits in linear order which makes it much easier to read. > I read about those commands in kde-core-devel. What the best commands to=20 merge a branch are seems to be an open topic there. Ok, I will try those on= es=20 next time I merge a branch. =20 > > I have the two questions I wrote above: 1. we still need to store > >=20 > > the > > LayoutName somewhere, kwinrc is the logical place, will it still be > > used to > > strore LayoutName? 2. where the dbus call to change the layout will > > be issued? >=20 > There is already a D-Bus call to activate the window switcher from the > panel. All it needs is adding another optional parameter for the > layoutName to the D-Bus call. So no config value required at all :-) Ok, now I get it. That also means if someone wants to set a different=20 LayoutName other than the default one hardcoded in kwin he/she will have to= =20 save that configuration somewhere else (not in kwinrc) and then issue the d= bus=20 call to set the configuration. Hmmm let's hope we do not need to change the= =20 default we use in Plasma Active :-) =2D-=20 Lamarque V. Souza KDE's Network Management maintainer http://planetkde.org/pt-br --Boundary-01=_XVwlPyhkCVxUEwH Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable

Em Tuesday = 24 April 2012, Martin Gr=C3=A4=C3=9Flin escreveu:

> Am 24.= 04.2012 20:08, schrieb Lamarque V. Souza:

> > = I usually do that, this time I did a "git merge" and forgot to do= a

> > <= /p>

> > &= quot;git

> > c= ommit --amend" afterwards.

> <of= ftopic>You actually caused a merge commit. That's not needed at all.

> You co= uld do a:

> git ch= eckout master

> git pu= ll

> git ch= eckout topicBranch

> git re= base master

> git me= rge topicBranch

> That w= ay no merge commit is added. It's not so interesting to know how

> the to= picBranch had been called on your local installation and it puts

> all co= mmits in linear order which makes it much easier to read.

> </o= fftopic>

&nb= sp;

I read abo= ut those commands in kde-core-devel. What the best commands to merge a bran= ch are seems to be an open topic there. Ok, I will try those ones next time= I merge a branch.

> > = I have the two questions I wrote above: 1. we still need to store

> > <= /p>

> > t= he

> > L= ayoutName somewhere, kwinrc is the logical place, will it still be

> > u= sed to

> > s= trore LayoutName? 2. where the dbus call to change the layout will

> > b= e issued?

> There = is already a D-Bus call to activate the window switcher from the

> panel.= All it needs is adding another optional parameter for the

> layout= Name to the D-Bus call. So no config value required at all :-)

&nb= sp;

Ok, now I = get it. That also means if someone wants to set a different LayoutName othe= r than the default one hardcoded in kwin he/she will have to save that conf= iguration somewhere else (not in kwinrc) and then issue the dbus call to se= t the configuration. Hmmm let's hope we do not need to change the default w= e use in Plasma Active :-)

&nb= sp;

Lamarque V.= Souza

KDE's Netwo= rk Management maintainer

http://plan= etkde.org/pt-br

--Boundary-01=_XVwlPyhkCVxUEwH-- --===============4726118588958919111== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kwin mailing list kwin@kde.org https://mail.kde.org/mailman/listinfo/kwin --===============4726118588958919111==--