No, you'll end again with a new branch
git checkout master git pull -r git checkout bug317682 git rebase master git checkout master git merge bug317682 git push origin master On Mon, Jun 3, 2013 at 8:15 PM, Ian Neal <iann_bugzi...@blueyonder.co.uk>wrote: > Hi, > > Last time I tried to push to git I ended up creating a new branch and I > don't want to do that again so I can just check I am doing the right thing. > I have a branch at the moment called bug317682 which has the patch > committed to it. > I am planning to do: > git checkout master > git pull -r > git checkout bug317682 > git rebase master > git push origin bug317682 > Would that be correct? > > TIA, > > Ian > > Alvaro Soliverez wrote: > > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/109918/ > > Ship it! > > It looks fine to me. Go ahead and push it to master. > > > - Alvaro > > On April 8th, 2013, 10:27 p.m. UTC, Ian Neal wrote: > Review request for KMymoney. > By Ian Neal. > > *Updated April 8, 2013, 10:27 p.m.* > Description > > On KDE 4.10.1 setting of a holiday region to United Kingdom no longer makes > public holidays non-processing days. > This patch: > * Makes use of new HolidayRegion API to generate list of regions with > languages for holiday region selector in schedule settings pane. > I believe the new API was added in KDE 4.5 > > Testing > > Tested against recent git master compiled on KDE 4.10.1 > Needs to be tested against other KDE versions 4.5 upwards but I only have > access to 4.10.1 > > *Bugs: * 317682 <http://bugs.kde.org/show_bug.cgi?id=317682> > Diffs > > - kmymoney/dialogs/settings/ksettingsschedules.cpp (b57d5dd) > > View Diff <http://git.reviewboard.kde.org/r/109918/diff/> > > > > _______________________________________________ > KMyMoney-devel mailing list > KMyMoney-devel@kde.org > https://mail.kde.org/mailman/listinfo/kmymoney-devel > >
_______________________________________________ KMyMoney-devel mailing list KMyMoney-devel@kde.org https://mail.kde.org/mailman/listinfo/kmymoney-devel
