kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'brotherbard/experimental'

Browse Source 
Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBGitWindowController.m
	PBViewController.m
	html/views/history/history.css
	html/views/history/history.js
This commit is contained in:
Dave Grijalva
2010-06-02 02:35:32 -07:00
parent 158b569ac9 096a176fbd
commit 39ec2319bf
152 changed files with 20881 additions and 3589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/views/commit/commit.css
+1 -1
View File
@@ -1,7 +1,7 @@
body {
padding: 0px;
margin: 0px;
margin-top: 20px;
margin-top: 30px;
}
#title {
html/views/commit/commit.js
+1 -1
View File
@@ -57,7 +57,7 @@ var showFileChanges = function(file, cached) {
if (file.status == 0) // New file?
return showNewFile(file);
setTitle((cached ? "Staged": "Unstaged") + " changes for" + file.path);
setTitle((cached ? "Staged": "Unstaged") + " changes for " + file.path);
displayContext();
var changes = Index.diffForFile_staged_contextLines_(file, cached, contextLines);