how/where to merge code

Marcus Müller marcus.mueller at ettus.com
Sat Jul 18 14:26:16 UTC 2015


Hi Hayati,

I'm pretty sure git.osmocom.org is the upstream; to ask steve-m to merge 
your changes into his repository, just log on to github, go to 
https://github.com/hayguen/librtlsdr, and you should see something like
"This branch is 2 commits ahead of steve-m:master    Pull Request"
right at the top, just under the header where you can select your branch.

The Impressum of osmocom.org said to send in patches via this mailing 
list, so that's what I did once, and that worked too :), so assuming 
steve-m's repo is called "steve-m" in your git ("git remote -v" will 
tell), and the modified master branch being currently checked out

git format-patch steve-m/master

will generate a patch file for each commit between your master's HEAD 
and steve-m/master.

Greetings,
Marcus


On 18.07.2015 16:06, Hayati Ayguen wrote:
> Hi,
>
> just wanted to ask, what to do, so that my changes on
> https://github.com/hayguen/librtlsdr  get  merged into
> https://github.com/steve-m/librtlsdr  ?
>
> Just now, in this moment, i realize, that there's alos
> git://git.osmocom.org/rtl-sdr.git referenced at
> http://sdr.osmocom.org/trac/wiki/rtl-sdr
>
> Ok, which is the real origin for rtl-sdr?
> What is needed to get the changes there?
>
>
> Besides the changes on rtl_fm i've developed a small tool, i called
> "stdin2wav". It's used by piping rtl_fm's output into stdin2wav, which
> then saves the output into wave files using libsndfile.
> Besides saving, it can be combined with the squelch function of rtl_fm.
> stdin2wav closes the wave file when no more data comes from stdin .. and
> re-opens a new wave file when new data arrives, cause the squelch opened ..
>
> Can/should this small tool also merged to rtl-sdr? Someone has a better
> place?
> By the way: someone has a better name?
>
>
> kind regards,
> Hayati
>




More information about the osmocom-sdr mailing list