On 10/10/2015 11:29 AM, Andreas Hüttel wrote:
> commit: a33ebdd225fcf82f3e81a81f676de007bdecd670
> Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
> AuthorDate: Sat Oct 10 09:30:20 2015 +0000
> Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
> CommitDate: Sat Oct 10 09:30:20 2015 +0000
> URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33ebdd2
>
> Merge branch 'master' of git+ssh://git.gentoo.org/repo/gentoo
>
> app-admin/conky/conky-1.10.0.ebuild | 2 +-
> app-portage/g-sorcery/g-sorcery-0.2.1.ebuild | 2 +-
> app-portage/g-sorcery/g-sorcery-0.2.ebuild | 2 +-
> media-tv/xawtv/files/xawtv-3.95-stdbool.patch | 10 ++++++++
> media-tv/xawtv/xawtv-3.95-r3.ebuild | 1 +
> media-video/cinelerra/cinelerra-20140710.ebuild | 4 ++-
> .../cinelerra/files/cinelerra-asm-gcc52.patch | 15 +++++++++++
> .../cinelerra/files/cinelerra-putbits-gcc52.patch | 29
> ++++++++++++++++++++++
> net-misc/redir/metadata.xml | 6 +++--
> profiles/arch/arm/package.use.mask | 6 ++++-
> 10 files changed, 70 insertions(+), 7 deletions(-)
>
You should (almost) never commit reverse-merges of git.gentoo.org master[0].
Instead, you have to use
git pull --rebase=preserve origin master
in case you get "push conflicts" [1]
[0] https://wiki.gentoo.org/wiki/Gentoo_git_workflow#About_merging
[1] https://wiki.gentoo.org/wiki/Gentoo_git_workflow#About_rebasing
The wording needs to be improved a bit, though.
You can also use "gitk" (tk USE flag of git) to have a more visualized
form of the history before you push.
