On 28 April 2010 18:57, Felipe Sateler <fsate...@gmail.com> wrote: > On Wed, Apr 28, 2010 at 11:38, Harry Rickards <ha...@linux.com> wrote: >> On 28 April 2010 16:30, <hrickards-gu...@users.alioth.debian.org> wrote: >>> The following commit has been merged in the master branch: >>> commit a00c0019ef859d52834bfd75f61046c5a7583650 >>> Merge: 7b52094914795b119554c72005f8a71b5b7ff559 >>> 521457f7eb1ad6056bd9fa6e68d9062a8214acb4 >>> Author: Harry <hricka...@l33tmyst.com> >>> Date: Wed Apr 28 16:29:55 2010 +0100 >>> >>> Merge branch 'master' of git://git.debian.org/git/pkg-multimedia/lives >>> >> Damn. I had a directory with some changes not in git in, and added a >> new upstream author to debian/copyright. When pushing I got a >> non-fast-foward-error, and I though 'git pull'ing and pushing again >> would fix this. What should I do now? Out of the 4 commits this merge >> has made, only the debian/copyright is needed. Sorry everyone! > > Just revert the changes that are not necessary (git revert <commit>). >
Ok, thanks for the advice (learning more than the *very* basics of git is on my todo list). So would I just do 'git revert 4a4bc9db5c3d824edea51495b8b3d2cd860d260c'. That comes up with: fatal: Commit a00c0019ef859d52834bfd75f61046c5a7583650 is a merge but no -m option was given. I'm not sure what to put for the -m option. Should it just be a 1? One of the merges was for the new name I added in debian/copyright (a00c0019ef859d52834bfd75f61046c5a7583650). Do I need to revert this merge and readd the name to debian/copyright or should I just leave it as it is at the moment? -- Harry Rickards - ha...@linux.com Vote Lib Dem - Building a fairer Britain - http://libdems.org.uk _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers
