This is an automated email from the git hooks/post-receive script.
unknown user pushed a change to branch hjl/pr21742 in repository glibc.
discards f0dbaf3228 Don't include _dl_resolve_conflicts in libc.a [BZ #21742] discards 0d39682d45 Remove debug/stack_chk_fail_local.c [BZ #21740] adds eb73083e5e Don't include _dl_resolve_conflicts in libc.a [BZ #21742] new 712e70de97 Remove debug/stack_chk_fail_local.c [BZ #21740]
This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this:
* -- * -- B -- O -- O -- O (f0dbaf3228) \ N -- N -- N refs/heads/hjl/pr21742 (712e70de97)
You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B.
Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever.
The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference.
Summary of changes: ChangeLog | 6 ++++++ elf/Makefile | 1 + 2 files changed, 7 insertions(+)