Repository navigation
Pull again before the commit: a staged pull is no adaptation
Changes:
- A pull staged but not committed yet no longer shows the file as
adapted or 'not adaptable!': the committed file is compared with the
base it was committed with. The same for add --overwrite over a
committed file. - Pulling a file again before the commit works, e.g. to another version;
the proposed message gets a section for each pull. Merged adaptations
still need a commit first. - pull --overwrite after a staged pull no longer reports content as
discarded.
Documentation:
- MANUAL: pulling again before the commit.