Excerpts from Mathias Panzenböck's message of Thu Nov 19 19:26:12 +0100 2009:
> On 11/19/2009 09:50 AM, Bart Cerneels wrote:
> > 
> >> We've already merged your request but it went with great difficulty.
> >> In the end markey managed to do it since I failed completely. This
> >> might be because your repo has some "interesting" branching and
> >> merging complicated by the automatic rebasing I had set-up for master.
> >> I suggest starting over with a new branch and cherry pick the RSS 1.0
> >> and Atom support in before doing a new merge request and only commit
> >> relevant changes to that branch, certainly no merges from master.
> >> Markey also suggested you use git-squash, please ask him for details.
> >>
> 
> I'm new to git and it's workflows. I never rebased, sqashed or done similar
> things before. Just merging changes. Hope I'll figure it out fast, because I
> will not have much time until February (well, *maybe* in the christmas break;
> I'm studying Software Engineering and Internet Computing Master at the
> University of Technology in Vienna).
> 
> >> I'm busy with my other big project today, this weekend and next week.
> >> Hell, probably for the next 6 months. So I can't promise when I'll be
> >> online or able to check the code. The other devs can tell if it makes
> >> sense, I trust them.
> >>
> >> See you later.
> >> Stecchino
> >>
> > 
> > One last thing: set you email address with:
> > git --global user.email grosser.meister.morti@gmx.net
> > 
> 
> This says:
> $ git --global user.email grosser.meister.morti@gmx.net
> Unknown option: --global
> usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate|--no-pager]
> [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]

That should be
git config --global user.email grosser.meister.morti@gmx.net

> $ git --version
> git version 1.6.2.5
> 
> $ cat ~/.git/config
> [user]
>         email = grosser.meister.morti@gmx.net
>         name = Mathias Panzenböck

If you run git config --list in your amarok clone, do you get these
values? If not, they're overridden in your amarok/.git/config, or
environment.

> I wondered about that myself and I do have my email set up in ~/.git/config
> (which was written by git itself!). Very strange. I now copied this into
> ~/.gitconfig and now it seems to work.
> 
> > Not having a valid email screws up our commit emails.
> > 
> > Bart
> > 
> 
>     -panzi
-- 
Exherbo KDE, X.org maintainer
_______________________________________________
Amarok-devel mailing list
Amarok-devel@kde.org
https://mail.kde.org/mailman/listinfo/amarok-devel