4 ms·
Rebase should not be done on a large history. Merge long histories, only rebase short ones. Long histories are probably useful to see separately in the git hist
by mcv 7y ago
Rebase should not be done on a large history. Merge long histories, only rebase short ones. Long histories are probably useful to see separately in the git history anyway, and it's only for a history of one or two commits that the extra merge commits begin to dominate the real commits in your history.
When in doubt, just merge. It's always safer.