On Fri, Jul 31, 2015 at 09:27:00PM +0200, Michael Niedermayer wrote: > On Fri, Jul 31, 2015 at 05:37:12PM +0200, Clément Bœsch wrote: > [...] > > So in order for the community to continue this, I'd say we probably need > > to have some help for: > > > > - guidelines on the merge strategies > > The merge process i used is quite simple
one trick i forgot as it happens with multi user git when doing a merge someone else occasionally pushes something before one can push the finished merge to update/rebase a local merge onto some updated origin the attached script works most of the time. note, this works only with a single commit/merge locally if you have multiple merges which arent pushed it wont work also the result should be looked at quickly before pushing [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I have never wished to cater to the crowd; for what I know they do not approve, and what they approve I do not know. -- Epicurus
#!/bin/bash set -e # set -v # set -x git diff HEAD | grep . && exit 1 || true git show | grep '^Merge: [a-f0-9][a-f0-9]* [a-f0-9][a-f0-9]*$' >/dev/null #TOMERGE=`git show | grep 'Merge commit' | sed 's/.*'\''\(.*\)'\''/\1/'` TOMERGE=`git show | grep '^Merge:' | sed 's/Merge: [a-f0-9][a-f0-9]* \(.*\)/\1/'` OLDCOMMIT=`git show | grep '^commit ' | sed 's/commit//'` git diff HEAD^ > mergerebase.tmp git reset --hard HEAD^ git pull --rebase git merge --stat --no-commit --log $TOMERGE -Xrename-threshold=10 -Xpatience | sort git diff HEAD | patch -p1 -R patch -p1 < mergerebase.tmp git commit -a -C $OLDCOMMIT
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
