Dimitri John Ledkov [2015-06-02 15:58 +0100]: > And I think this is _good_, because the submitter's commit ids will be > preserved (together with the signed gpg commits) and the maintainers > are discouraged to "fix-up" and/or "adjust" commits upon rebase / > git-am. Instead fix-ups from reviewer should go as separate commits or > as part of the merge commit.
Please don't commit them separately. Not only would that make the history even bigger and harder to read, but it's simply not good practice to have known-broken commits in the tree. Every commit should be good, which is particulary important for bisecting and cherry-picking. Personally I like a flat history with rebasing, as it's a lot clearer to read, and bisect through; and TBH we aren't interested in keeping the whole history of "bad" commits in trunk which are fixed up later. So, reporters using git push -f to amend fixups to their original commits after review is fine. But please let's not clutter trunk with the entire history of what should be a single commit? Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel