huizhougit / githd

MIT License
105 stars 24 forks source link

File history doesn't list related merge commits #37

Open cateyes99 opened 4 years ago

cateyes99 commented 4 years ago

I have a file having the commits shown below.

λ git log master --graph --date-order --oneline -- **/assessment-form-select.component.ts

* 6bc5a388 Merged PR 12120: Fixed Issue with product values disappearing when you go to the next page and come back
* 80143d60 Merged PR 12077: Product Recommendations Checklist
*   7e75e5dd Merged PR 11788: Fixed Barber selecting hairdresser
|\
| * bb7130eb Fixed bug
* | 1a29104d 15317 MED: I cook as part of my business question, difficult to select
* | dd5b1d6e 15317 MED: I cook as part of my business question, difficult to select
|/
* 9c6c5e85 Fixed min height
* 6e12a7b1 Added bool so dropdown changes only happen when wanted
* 0f7ee060 Fixed UI
* 09f98481 Added check for nativeElement not null
* 47713a0f Add extra logic to check for is input selected in Android - handle element read order
* e3b50c49 Add max select length constant. Add element attribute for maxlength on search component.

Git History Diff doesn't show the merge commit 7e75e5dd in the file history, but all others including merge commits 6bc5a388 & 80143d60 (see the screenshot below). Unless there are no commits 1a29104d & dd5b1d6e here, then the merge commit 7e75e5dd is unrelated and doesn't need to show up in the file history. image

huizhougit commented 4 years ago

The history is using --simplify-merges underlining.

cateyes99 commented 4 years ago

I've checked out with --simplify-merges, it does show up the merge commit 7e75e5dd as below. You might need to dig into it a bit?

λ git log --simplify-merges --format=oneline master -- **/assessment-form-select.component.ts

6bc5a38877c6a7a639b5b2ae1241b48449bd7721 Merged PR 12120: Fixed Issue with product values disappearing when you go to the next page and come back
80143d6020f547673bcd7a9e32d37dae3f93a2f7 Merged PR 12077: Product Recommendations Checklist
7e75e5ddbb7a89aff09fa300c4f42eca597fca36 Merged PR 11788: Fixed Barber selecting hairdresser
bb7130eb4ed892a5bd6a29eaca452b07d2615025 Fixed bug
1a29104d37cc157ddf6edfc13f82e453aa5f9ecf 15317 MED: I cook as part of my business question, difficult to select
dd5b1d6efdda034f327cef6ec8978e43937825f7 15317 MED: I cook as part of my business question, difficult to select
9c6c5e85c1b3dde5461831ed2332942e7681e155 Fixed min height
6e12a7b1e8d17e32922ea1923fbccf1b79738e4c Added bool so dropdown changes only happen when wanted
0f7ee0602de4e68dfd0c9803fc2aa38e13958246 Fixed UI
09f98481f7254eaab1e9870e6570dc7f735a2883 (origin/working/pc_14034_FixAndroidOcc) Added check for nativeElement not null
47713a0f66604fda53a087703d7d2cfad81cea02 Add extra logic to check for is input selected in Android - handle element read order
e3b50c49f0f87dc8c401d29b2fea5e628d8b8b9d Add max select length constant. Add element attribute for maxlength on search component.
gentlecoder commented 3 years ago

Same problem, but when I click the githd button, the merge commits shows. I think first it uses --no-merges, when I click the githd button it does not.