Repository navigation
pr-git-2448/HaraldNordgren/reflog-operations-v2
tagged this
18 Oct 18:27
Create a better reflog. Follows the discussion in https://lore.kernel.org/git/akZfm-igZKeHaDST@pks.im/. "git reflog" lists every step of a rebase and every branch switch, which makes it hard to see what was done and on which branch. This adds two options to "git reflog" and "git log -g": * --operations shows one entry per command, folding a rebase into the entry that finished or aborted it, and leaves out entries that change no branch. * --historical-branch decorates each entry with the branch HEAD was on when it was recorded. Changes in v2: * Move the "historical branch" rightward in the display for cleaner alignment. * Improve commit messages. Harald Nordgren (3): reflog: name the strings that mark switches, renames and rebase steps reflog: add --operations to show one entry per command reflog: add --historical-branch to name the branch of each entry Documentation/git-reflog.adoc | 4 + Documentation/rev-list-options.adoc | 21 +++ builtin/branch.c | 3 +- builtin/checkout.c | 3 +- builtin/rebase.c | 17 +-- log-tree.c | 28 +++- object-name.c | 3 +- reflog-walk.c | 183 +++++++++++++++++++++++-- reflog-walk.h | 6 +- reflog.h | 6 + revision.c | 14 ++ revision.h | 2 + sequencer.c | 13 +- t/t1414-reflog-walk.sh | 198 ++++++++++++++++++++++++++++ wt-status.c | 3 +- 15 files changed, 471 insertions(+), 33 deletions(-) base-commit: c51408889c3b372814bc20b9431c3b74d0d268eb Submitted-As: https://lore.kernel.org/git/pull.2448.v2.git.git.1792348037.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.2448.git.git.1792070038.gitgitgadget@gmail.com