Hi Emilian, Am Dienstag, den 03.10.2017, 15:27 +0300 schrieb Emilian Bold: > I looked with > > > > > $ git diff --stat --cached apache/master > > git/src/org/netbeans/modules/git/ui/repository/remote/RemoteReposi > > tory.java > > > 13 ++++++++++--- > > > > 1 file changed, 10 insertions(+), 3 deletions(-) > > so I was only supposed to push one change. > > But $ git push apache master > > > Counting objects: 18, done. > > Delta compression using up to 8 threads. > > Compressing objects: 100% (13/13), done. > > Writing objects: 100% (18/18), 2.09 KiB | 0 bytes/s, done. > > Total 18 (delta 10), reused 1 (delta 1) > > remote: incubator-netbeans git commit: Merge branch 'master' of > > https://github.com/apache/incubator-netbeans > > remote: incubator-netbeans git commit: Made Git keyfile auto > > detection > > when key auth is selected. > > remote: incubator-netbeans git commit: [NETBEANS-54] Module Review > > server > > remote: incubator-netbeans git commit: [NETBEANS-54] Module Review > > defaults > > remote: incubator-netbeans git commit: [NETBEANS-54] Module Review > > db.mysql > > To https://git-wip-us.apache.org/repos/asf/incubator-netbeans.git > > 9a152a7..bd9aece master -> master > > > So now I see those annoying "committed with emilianbold 4 days ago" > commits. > > What went wrong? > > It was a fresh clone (git checkout -b master2 apache/master) too... > > Sigh... >
This looks like some rebases happened. This was a straight merge I did from the PR into master (without rebasing): https://github.com/apache/incubator-netbeans/commit/cb443c2efbbd41df528c4166f0b0a629d899cec5 and this I did by pulling the PR from borxa rebasing+squashing it together: https://github.com/apache/incubator-netbeans/commit/9a152a75f50f53219b3b2669b6ab9e69a9beb1d7 So could it be, that you did some rebasing and that went wrong? On the positive side the repository looks to be still in a sane state. Greetings Matthias
