pull --rebase: exit early when the working directory is dirty

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index 9f0822fab3d10fd5a83234f761847d7818c6da0a..aa0eeca24786dbd5143354fc3bb5e8cdb3ef831f 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -85,6 +85,10 @@ div.title, a.title {
        color: #000000;
 }
 
+div.readme {
+       padding: 8px;
+}
+
 a.title:hover {
        background-color: #d9d8d1;
 }
@@ -170,21 +174,22 @@ a.text:hover {
 
 table {
        padding: 8px 4px;
-}
-
-table.project_list {
        border-spacing: 0;
 }
 
 table.diff_tree {
-       border-spacing: 0;
        font-family: monospace;
 }
 
+table.combined.diff_tree th {
+       text-align: center;
+}
+
 table.combined.diff_tree td {
        padding-right: 24px;
 }
 
+table.combined.diff_tree th.link,
 table.combined.diff_tree td.link {
        padding: 0px 2px;
 }
@@ -276,6 +281,12 @@ table.diff_tree span.file_status.copied {
   color: #70a070;
 }
 
+/* noage: "No commits" */
+table.project_list td.noage {
+       color: #808080;
+       font-style: italic;
+}
+
 /* age2: 60*60*24*2 <= age */
 table.project_list td.age2, table.blame td.age2 {
        font-style: italic;
@@ -419,7 +430,7 @@ div.search {
        font-size: 100%;
        font-weight: normal;
        margin: 4px 8px;
-       position: absolute;
+       float: right;
        top: 56px;
        right: 12px
 }
@@ -453,6 +464,14 @@ a.rss_logo:hover {
        background-color: #ee5500;
 }
 
+a.rss_logo.generic {
+       background-color: #ff8800;
+}
+
+a.rss_logo.generic:hover {
+       background-color: #ee7700;
+}
+
 span.refs span {
        padding: 0px 4px;
        font-size: 70%;