gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Formatting.

Browse source
This commit is contained in:
Phil Jackson 2010-07-06 00:07:37 +01:00
parent f569ff8359
commit 9e45718491
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
magit.el
View file

@ -2557,7 +2557,13 @@ insert a line to tell how to insert more of them"
(format "branch %s" (format "branch %s"
(propertize remote-branch 'face 'magit-branch))) (propertize remote-branch 'face 'magit-branch)))
(remote (remote
(concat remote " " (magit-get "remote" remote "url"))) (concat
(propertize remote-branch 'face 'magit-branch)
" @ "
remote
" ("
(magit-get "remote" remote "url")
")"))
(t (t
(run-hook-with-args-until-success 'magit-remote-string-hook)))) (run-hook-with-args-until-success 'magit-remote-string-hook))))
@ -2573,11 +2579,11 @@ insert a line to tell how to insert more of them"
(no-commit (not head))) (no-commit (not head)))
(when remote-string (when remote-string
(insert "Remote: " remote-string "\n")) (insert "Remote: " remote-string "\n"))
(insert (format "Local: %s %s\n" (insert (format "Local: %s %s\n"
(propertize (or branch "(detached)") (propertize (or branch "(detached)")
'face 'magit-branch) 'face 'magit-branch)
(abbreviate-file-name default-directory))) (abbreviate-file-name default-directory)))
(insert (format "Head: %s\n" (insert (format "Head: %s\n"
(if no-commit "nothing commited (yet)" head))) (if no-commit "nothing commited (yet)" head)))
(let ((merge-heads (magit-file-lines ".git/MERGE_HEAD"))) (let ((merge-heads (magit-file-lines ".git/MERGE_HEAD")))
(if merge-heads (if merge-heads