Does magit offer a way to squash a bunch of commits, but preserve some sort of record of the micro commits - should you need to step through them the next day.
asked Jan 10 at 16:45
Add a comment
|
Just create a branch before squashing.
In magit:
- Optional: copy the name of the current branch (you can find it on the first line of the
*magit*buffer). b nto create a new branch. Paste the name of the current branch if it helps you, and give the new branch a unique name (e.g. with a-detailed-historysuffix).
(But better yet, don't squash. A detailed commit history is useful and squashing rarely has any benefit.)
answered Jan 10 at 19:44
Gilles 'SO- stop being evil'Gilles 'SO- stop being evil'
17.5k4 gold badges46 silver badges80 bronze badges
Magit does not provide any feature specifically for this use-case. It does however expose a git feature that can be used in this and other situations when you have to recover some discarded work: the reflog.
The reflog commands are available from the same popup menu as the log commands: l.
Search the web for information about what the reflog is and how to use it.
While viewing a reflog you can use l o RET to view the log for the reflog entry at point.
-
The reflog won't be preserved for long and can't be pushed. Why not give the current commit history a persistent name, i.e. a branch? – Gilles 'SO- stop being evil' Jan 10 at 19:44
-
It all depends on the use-case. So both answers makes sense and complete each other. – tarsius Jan 10 at 20:54
