dev builds
themes manual
device status forums
mailing lists
IRC bugs
dev guide

Rockbox mail archive

Subject: Re: [RaaA] Weekly status report

Re: [RaaA] Weekly status report

From: Maurus Cuelenaere <>
Date: Tue, 29 Jun 2010 20:40:03 +0200

 Op 29-06-10 11:45, Alex Bennee schreef:
> On 29 June 2010 09:15, Thomas Martitz
> <> wrote:
>> Am 29.06.2010 00:24, schrieb Maurus Cuelenaere:
>>> Do you have a branch containing the same commits but not merged with
>>> master (this makes it hard to find your work)?
>> No, but you can rebase to master locally
>> (or grep for all commits containing my name).

Doh, should've thought of that (git web interface even supports grep'ing)!

> FYI the GIT way to do it is to use git cherry:
> git cherry -v origin/master kugel/gsoc-app-target
> gives
> + 5be46e140b94b4d5ed63d58c4dbca2d3b4497c2d Convert many #ifdef
> + eb8cb880f85d18880beac04a74b5917c55e458e1 Some more ifdef fixes
> + 8576b9cb9bc3ae6ab8e4f751a853a437ea50bfc2 First working application target \o/
> + 4c7518b85f03092eff28e7b31002daaf90a9d121 Add forgotten files
> + cefaf11f411315eaae01067b9bf62e34fc3ddb50 Add forgotten files
> + 395622c972c5b1c55fce517cf680bd1c88d5631a Add system-target.h and
> remove left over #error
> + fa37b2fa6b5836dca713a3672ffca40a08509499 Fix configure/make reconf
> + 7109346f571a48e5d84dc7ae15ef256e65077499 Fix simulator warnings and
> get rid of some kludges in the button driver.
> + 6e472e87ace03620f9cdb936b82da65745ab5845 Remove a few warnings.
> + 7a7cdada12bae5826935051eb00d8a98b5ae9d69 Don't build some files from
> uisimulator/common, for the rest something better needs to be found.
> + 2e5da97f59e7f145aed2d0587e555e40aac090f9 revert unrelated change

Thanks, I knew there was a way to do this using git cli :)

> While re-baseing is really handy you must resit the temptation to do
> it with any public branches as it will confuse anyone tracking them.
> Of course for private branches you can go wild, I do it all the time
> as I'm cleaning stuff up for public consumption.

I agree.

Maurus Cuelenaere
Received on 2010-06-29

Page template was last modified "Tue Sep 7 00:00:02 2021" The Rockbox Crew -- Privacy Policy