> Can we always use "Rebase and merge" here? The "Create a merge > commit"(default option) generate many empty merge commits which make > the history hard to read. >
I would be in favor of this. I was looking at this earlier and we can control this with the .asf.yaml file in the repo if we want See the Merge Buttons sections here https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories The downside is that I frequently GPG sign my commits and this breaks that if the rebase is needed. I usually just rebase myself in edit mode so that I can sign them. As for the question that was raised earlier in this thread I think there are some misconceptions about what dates mean in git, commit or author date are not really going to solve seeing this in a linear fashion. You need to look at the graph resolution, especially if you are allowing merge commits (hence why rebase is much better). I have an alias that I use for generating the log output lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all Running this you see what is going on, and why you cannot just look at it in a linear fashion. This is also visible in the github graph view btw. Hope this is helpful. * 5d5897c309 - (4 hours ago) Merge pull request #41 from wingunder/wingunder_fix_compilation_bug_irq_f7_h7 - patacongo (HEAD -> master, origin/master, origin/HEAD) |\ | * 00df2f0fe2 - (5 hours ago) Fixed a compilation error, with irq debugging for stm32f7 and stm32h7 archs. - Pieter du Preez * | 7179f2940d - (9 hours ago) Merge pull request #40 from xiaoxiang781216/fix-shell-script-format - patacongo |\ \ | * | 3b9efc95a2 - (10 hours ago) Format all shell scripts in tools folder - Xiang Xiao |/ / * | 390ebd504f - (12 hours ago) arch/arm/src/stm32h7: Port QSPI driver from STM32F7 to STM32H7 - Minamiya_Natsuki |/ * 7136215930 - (33 hours ago) sched_mergepending.c: Correct some errors in comments. (#38) - patacongo * 3951c4de5a - (2 days ago) Merge branch 'master' of github.com:apache/incubator-nuttx - Gregory Nutt |\ | * 9e091d2027 - (2 days ago) Improvements for NRF52 (#37) - Mateusz Szafoni | * d644567dff - (2 days ago) sx127x: fix some coding standard problems (#36) - Mateusz Szafoni | * ebce5fb7ca - (2 days ago) Squashed commit of the following: - Gregory Nutt | * d612fd3dc5 - (3 days ago) Squashed commit of the following: - Xiang Xiao * | 7da409f3b5 - (4 days ago) tools/nxstyle.c: Add -r option to check specified range lines - liuhaitao |/ * 9b2fa8152c - (3 days ago) drivers/sensors/lsm6dsl.c: fix various compiler warnings - raiden00pl * 06c2e86d98 - (3 days ago) Documentation/NuttXCCodingStandard.html: Remove requirement to decorate ignored returned values with (void). (#31) - Gregory Nutt * 91d483591d - (3 days ago) drivers/modem/altair/altmdm_sys.c: Fix modem/altair semaphore related compiler warning - Xiang Xiao * 0ee8241606 - (3 days ago) Author: Gregory Nutt <gn...@nuttx.org> - jjlange * f9f8c6a79b - (3 days ago) net/icmp/icmp_netpoll.c: Fix return of uninitialized 'ret' when no error occurs. That is, on what should be a successful return from this function, an uninitialized value was returned, which may indicate an undeserved error. - Nathan Hartman * dfe74fc4cf - (3 days ago) Merge branch 'master' of github.com:apache/incubator-nuttx - Gregory Nutt --Brennan
