4 ms·
> It's really hard to track, especially on the CLI. git log --first-parent --max-parents=1 Now you don't see merge commits. Forbid merge commits with con
by ilammy 4y ago
> It's really hard to track, especially on the CLI.
git log --first-parent --max-parents=1
Now you don't see merge commits.
Forbid merge commits with conflict resolution, and you're done.
- Gigachad 4y agoHow do you forbid the ones with resolution? Genuine question because it seems like merge commits are a black hole where anything could happen and no one would notice.
- seba_dos1 4y agoJust require the merged branch to be fast-forwardable (but don't actually fast-forward it). If it's not, it will be obviously visible in `git log --graph`.
- seba_dos1 4y agoYou usually don't want to use both arguments at the same time as that will hide the whole merges (both merge commits and merged commits). You can however use one of those arguments to choose what you want to filter out, which is very handy. FWIW, `--max-parents=1` has an alias `--no-merges`.