Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Commits from merge/pull requests are squashed making it very hard to use git properly #44

Closed
paulmenzel opened this issue Feb 18, 2021 · 2 comments

Comments

@paulmenzel
Copy link
Contributor

Looking at the git history/log with #43, which had two commits, submitted, it looks like:

* e40146e8 (HEAD -> master, origin/main, origin/HEAD) marvell: prestera: Update prestera driver to v2.8.0 for kernel 5.10 (#43)
* 851571dc (marvell/main, main) Fix the wrong rxlos register number of swp8 in tn4810m and tn4810m-dn dts. (#35)

and

$ git log --stat
commit e40146e89e39c37a0c4315da34240dadce4fadd9 (HEAD -> master, origin/main, origin/HEAD)
Author: Taras Chornyi <73535074+taraschornyiplv@users.noreply.github.com>
Date:   Wed Feb 17 23:53:33 2021 +0200

    marvell: prestera: Update prestera driver to v2.8.0 for kernel 5.10 (#43)
    
    * marvell: prestera: Update prestera driver to v2.8.0
    
    New features:
            * phylink support
    
    NOTE:
    Prestera switchdev driver name has been changed to align with
    the upstream kernel. The new driver name is prestera instead of
    prestera_sw
    
    Signed-off-by: Taras Chornyi <taras.chornyi@plvision.eu>
    
    * marvell: prestera: enable Prestera driver
    
    Enable prestera driver for arm64 kernel 5.10  build
    
    Signed-off-by: Taras Chornyi <taras.chornyi@plvision.eu>

 packages/base/any/kernels/5.10-lts/configs/arm64-all/arm64-all.config           |     3 +-
 packages/base/any/kernels/5.10-lts/patches/0014-prestera-switchdev-driver.patch | 20013 ++++++++++++++++++++++++++++++++++++------------------------
 packages/base/any/kernels/5.10-lts/patches/series.arm64                         |     2 +-
 3 files changed, 12150 insertions(+), 7868 deletions(-)
[…]

Essential features like git bisect or git blame are not as useful if commits of a merge/pull request are squashed. Please disable that functionality.

@paulmenzel
Copy link
Contributor Author

https://docs.github.com/en/github/administering-a-repository/about-merge-methods-on-github has the details. I’d vote for Merge pull request. (For the other options, https://docs.github.com/en/github/administering-a-repository/configuring-commit-squashing-for-pull-requests shows where to find it in the settings.)

@KanjiMonster
Copy link
Contributor

Squash commits are now disabled for this repo and https://github.com/dentproject/linux.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants