From 5b2259445e059ad3a9be19955931c6d4f762cde9 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Thu, 1 Aug 2024 08:56:38 -0700 Subject: [PATCH] FAQ: remove workaround for fixed bug (#2476) --- docs/FAQ.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index 1d90d4c0d..07f5b72d3 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -162,11 +162,6 @@ this is to abandon the unneeded commits (using `jj abandon `). If you would like to keep both commits with this change ID, you can `jj duplicate` one of them before abandoning it. -Usually, the different commits associated with the divergent change ID should all -appear in the log, but due to #2476, they may not. If that happens, you can -either use `jj log -r 'all()' | grep ` or disable the -`revsets.short-prefixes` config option. - ### How do I deal with conflicted branches ('??' after branch name)? A [conflicted branch][branches_conflicts] is a branch that refers to multiple