4 ms·
> When I'm looking back at history that had a bunch of merges, I don't want to have to guess which branch was which before a merge. Merges in git actually have
by chronial 9y ago
> When I'm looking back at history that had a bunch of merges, I don't want to have to guess which branch was which before a merge.
Merges in git actually have a "direction", i.e. git records which branch was merged into which. So that information is recorded.
- dchest 9y agoIt records which commits the commit came from, not which branch. merge /\ commit-hash1 commit-hash2 When branching, Fossil creates a branch commit with the branch name (similar to git tag object), and also records changes to branch name in commits.
- lozenge 9y agoExcept for fast forward merges, which I generally disable. (And pull should be set to ffonly)
- chronial 9y agoYeah, the git cli in its default settings is very hostile towards that information ^^. Pull actually works the wrong way around – it merges the remote branch into the local branch and then pushes that as the new remote branch. So if you follow the first parent, you land in the pullers local part and bypass everything he merged.