magit-refresh-status: align messages for rebase message
"Rebasing:" was the longest message, but the status bar wasn't aligned before, now this: Local: (detached) ~/g/git/ Head: c6b2a51 gettextize: git-clone "Cloning into" message Rebasing: onto master (26 of 159); Press "R" to Abort, Skip, or Continue Is aligned like this: Local: (detached) ~/g/git/ Head: c6b2a51 gettextize: git-clone "Cloning into" message Rebasing: onto master (26 of 159); Press "R" to Abort, Skip, or Continue Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
This commit is contained in:
parent
19a8f263a0
commit
26107dda6f
1 changed files with 4 additions and 4 deletions
8
magit.el
8
magit.el
|
@ -2641,16 +2641,16 @@ insert a line to tell how to insert more of them"
|
|||
"log" "--max-count=1" "--abbrev-commit" "--pretty=oneline"))
|
||||
(no-commit (not head)))
|
||||
(when remote-string
|
||||
(insert "Remote: " remote-string "\n"))
|
||||
(insert (format "Local: %s %s\n"
|
||||
(insert "Remote: " remote-string "\n"))
|
||||
(insert (format "Local: %s %s\n"
|
||||
(propertize (or branch "(detached)")
|
||||
'face 'magit-branch)
|
||||
(abbreviate-file-name default-directory)))
|
||||
(insert (format "Head: %s\n"
|
||||
(insert (format "Head: %s\n"
|
||||
(if no-commit "nothing commited (yet)" head)))
|
||||
(let ((merge-heads (magit-file-lines ".git/MERGE_HEAD")))
|
||||
(if merge-heads
|
||||
(insert (format "Merging: %s\n"
|
||||
(insert (format "Merging: %s\n"
|
||||
(magit-concat-with-delim
|
||||
", "
|
||||
(mapcar 'magit-name-rev merge-heads))))))
|
||||
|
|
Loading…
Reference in a new issue