2 ms·
Agreed, once you grok the start/end semantics of rebase it is not hard to work with. But it can be intimidating for new users. I actually think it is easier to
by theptip 4y ago
Agreed, once you grok the start/end semantics of rebase it is not hard to work with. But it can be intimidating for new users.
I actually think it is easier to teach the fully-specified and interactive form ‘git rebase -i start-sha-a end-branch-b —-onto target-c’ which makes it really explicit what is going on (“snip from A to B and put that chain on C”). When you understand that you can start using the defaults that abbreviate the common cases. (Specifically “end-branch-b” is usually not needed since you usually run the command from that branch.) And getting to this level of grokking requires you to understand the data model mentioned above, but not any obscure internals, so I think it is a good bar for “knows enough of git” for senior engineers in most orgs.