From: Junio C Hamano Date: Fri, 27 Feb 2026 23:11:50 +0000 (-0800) Subject: Merge branch 'ps/history-ergonomics-updates' X-Git-Tag: v2.54.0-rc0~157 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb9c781f4f4be2e6bf6285149ba7007fdaa735e7;p=thirdparty%2Fgit.git Merge branch 'ps/history-ergonomics-updates' UI improvements for "git history reword". * ps/history-ergonomics-updates: Documentation/git-history: document default for "--update-refs=" builtin/history: rename "--ref-action=" to "--update-refs=" builtin/history: replace "--ref-action=print" with "--dry-run" builtin/history: check for merges before asking for user input builtin/history: perform revwalk checks before asking for user input --- bb9c781f4f4be2e6bf6285149ba7007fdaa735e7