How to save step repeat step?

I have the opportunity to use git for my R programming, and I came up with the following problem:

most of the time I need to write branches, since the same data set can produce different analyzes, tables and diagrams, like this one, I branched D into D1 and E.

A---B---C---D---E
             \
             D1

when something is wrong in B, I will check B, transcode it and then pass it again, say that it is now B1

A---B---C---D---E
     \       \
      B1      D1

In order for C, D, D1, E to start with B1, as shown below, I need to make LOTS from rebase

A---B---B1---C---D---E
                  \
                   D1

git rebase B1 C
git rebase C D
git rebase D D1
git rebase D E

I think it is completely stupid to do this, being newer in git, can someone enlighten me so I don't have to hit rebaseall the time?

+3
source share
3 answers

, , git rerere.
(. Fun with reerere)

: , , rerere.

+1

Rebasing . . " ", ​​ B1, trunk, ...---C---D---E---E+B1, D1 , D1 " ", B1, E.

( , , B1, )

+1

, , - D.

A---B---C---D---E
             \
             D1

A---B---C---D---E---B1
             \
             D1

A---B---C---D---E---B1
             \
             D1--B1

, Ben, , .

+1

Source: https://habr.com/ru/post/1792751/


All Articles