[Debian GNUstep maintainers] Git-fu for fixing #880460

[Yavor Doganov]

Yavor Doganov wrote:
> I'm not a Git expert, so please let me know if this is OK:

Actually, here's another idea: we can cherry-pick 9d27fc, then
manually remove the changes to debian/control with another commit.
When we merge back to experimental, just regenerate debian/control
with a separate commit.  Here is the updated list:

git branch -c master experimental
git branch -f debian/0.25.0-4
git merge 9d27fc
# edit debian/control & commit
# test, prepare upload
# commit changelog & tag 0.25.0-5
...later, not urgent...
git checkout experimental
git merge master
# regenerate debian/control & commit
...later, when we start the -gui transition...
git checkout master
git merge experimental
# prepare upload of 0.26.0-2 to unstable

> What I don't understand well is which command is better to use --
> merge or cherry-pick.

This still stands.