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