On Wed, 2012-08-08 at 17:56 +0200, Max Kellermann wrote: > On 2012/08/08 17:48, Jurgen Kramer <gtmkra...@xs4all.nl> wrote: > > On Tue, 2012-08-07 at 20:02 +0200, Max Kellermann wrote: > > > On 2012/08/03 15:22, Jurgen Kramer <gtmkra...@xs4all.nl> wrote: > > > > Commit: > > > > http://git.musicpd.org/cgit/gtmkramer/mpd.git/commit/?id=0156b6b1717bfc3c43fee6a6a6c6249f2abcb753 > > > > > > > > Repo: > > > > http://git.musicpd.org/cgit/gtmkramer/mpd.git/ > > > > > > Fails to build when libid3tag is disabled: > > > > > > src/decoder/dsdlib.c:142: error: undefined reference to 'id3_tag_parse' > > > src/decoder/dsdlib.c:146: error: undefined reference to 'tag_id3_import' > > Thanks, fixed it > > You added a new commit that is supposed to fix the bug in the first > commit, but I do not want to merge the first commit when we already > know it's faulty, because it will make bisecting difficult. These two > commits should be folded into one before I merge the feature. > > > I am still not completely comfortable with git, hopefully correct now. > > It's not. You did not rebase, you merged again. Rebasing is as easy > as typing: > > git pull --rebase git://git.musicpd.org/master/mpd.git master > OK, I did only a git pull --rebase, figures it did not do anything. I cannot seem to reset my git to master. After resetting my local copy and re-adding the code git diff shows the correct changes. When I push I only get 'Everything up-to-date'
Jurgen ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
