https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #15 from Luigi Toscano ---
Thanks!
--
You are receiving this mail because:
You are watching all bug changes.
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #14 from David Hurka ---
Bug 410723:
> Git commit ab7ae92a891adcb5c43435e75ea0e9ce8c078d81 by David Hurka, on behalf
> of René van Paassen.
Ok, should be fine now.
So a GitLab “merge”-merge merges the actual commits, as they were
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #13 from Albert Astals Cid ---
**
The correct behavior would have been to locally check out Rene’s branch, squash
merge it including author information to release/20.08, and then non-force push
that merge commit to
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #12 from David Hurka ---
Thanks, I think now I understand what is going on. I *created* the new MR in
GitLab, so GitLab considered me being the author, although the commits *in* the
MR are from Rene. The correct behavior would have been to
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #11 from Luigi Toscano ---
No need to reset the branch: if you push a revert and then the original change
again with the correct author, the git commands will find the last author. So
just
* git revert, git commit --author, git push (i. e.
https://bugs.kde.org/show_bug.cgi?id=353560
Albert Astals Cid changed:
What|Removed |Added
CC||aa...@kde.org
--- Comment #10 from Albert
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #9 from David Hurka ---
This page tells me that we use the squash feature in GitLab.
https://community.kde.org/Infrastructure/GitLab#Create_the_Merge_Request
Do you say I should not use the Merge button in GitLab, but push merge requests
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #8 from Luigi Toscano ---
(In reply to David Hurka from comment #6)
> > use the authorship information in git
>
> I can revert that, but how should I include the authorship information? I
> could add these information in the commit
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #7 from David Hurka ---
> a revert commit and a new commit
As alternative, to keep the mess more compact, I could append a single commit
that informs about the authors of the last commits.
--
You are receiving this mail because:
You are
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #6 from David Hurka ---
> use the authorship information in git
I can revert that, but how should I include the authorship information? I could
add these information in the commit message, but GitLab will always set me as
the “author”.
Do
https://bugs.kde.org/show_bug.cgi?id=353560
Luigi Toscano changed:
What|Removed |Added
CC||luigi.tosc...@tiscali.it
--- Comment #5 from
https://bugs.kde.org/show_bug.cgi?id=353560
--- Comment #4 from David Hurka ---
(The actual code implementing this feature was submitted by Luca Citi. Thanks!)
--
You are receiving this mail because:
You are watching all bug changes.
https://bugs.kde.org/show_bug.cgi?id=353560
David Hurka changed:
What|Removed |Added
Resolution|--- |FIXED
Version Fixed In|
https://bugs.kde.org/show_bug.cgi?id=353560
Bug Janitor Service changed:
What|Removed |Added
Status|CONFIRMED |ASSIGNED
--- Comment #2 from Bug Janitor
https://bugs.kde.org/show_bug.cgi?id=353560
David Hurka changed:
What|Removed |Added
CC||foice.n...@gmail.com
--- Comment #1 from David
https://bugs.kde.org/show_bug.cgi?id=353560
David Hurka changed:
What|Removed |Added
Status|REPORTED|CONFIRMED
Ever confirmed|0
16 matches
Mail list logo
