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
1,449 Commits 2 Branches 18 Tags
e00f7343b169aca0c2108e8e17ea9a67a4ccdd13
Commit Graph

1449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
German Laullon e00f7343b1 Merge pull request #61 from Uncommon/helptags 
Help tags for remotes and tags
 2011-05-19 16:34:12 -07:00
German Laullon 96a8794edd Merge pull request #67 from firesteps/master 
Dock menu
 2011-05-19 11:58:44 -07:00
German Laullon 009affe4af Merge pull request #68 from RomainMuller/small_fixes 
Small fixes
 2011-05-19 11:56:24 -07:00
Romain Muller c1b3658e05 Explicit cast to remove warning. 2011-05-19 18:22:02 +02:00
Romain Muller 7f281498f0 Add missing message declaration in header file. 
Use specific type instead of id.
 2011-05-19 18:18:34 +02:00
Romain Muller b71e1ca0f0 Explicit cast is needed if we abuse the delegate that way. 2011-05-19 18:18:34 +02:00
Romain Muller a56f82ac2c Ugly coupling with mis-use of delegate is ugly. 2011-05-19 18:18:34 +02:00
Romain Muller 3ada98c765 Use of stringWithFormat in this situation is overkill. 2011-05-19 18:09:01 +02:00
Valiev Omar 970352c89a New Dock menu. 2011-05-19 14:55:33 +04:00
German Laullon 22e4f1894f build_libgit2.sh bug 2011-05-19 11:15:08 +02:00
German Laullon e4a0cf6d07 Merge pull request #66 from RomainMuller/update_libgit2 
Update libgit2 to 0.12
 2011-05-19 01:07:31 -07:00
Romain Muller a3175617da Fix missing symbol due to relocation in libgit2. 2011-05-19 09:29:47 +02:00
Romain Muller 16c4ef4ae6 Switch to own fork to have wafscript hack. 2011-05-19 09:21:19 +02:00
Romain Muller 451335acd3 Build fat and use XCode's 32_64 arch specification style. 2011-05-19 09:21:18 +02:00
Romain Muller b3cfd7fd0d Build fat libgit2 2011-05-19 09:21:18 +02:00
Romain Muller 6d8982ab4b Build with WAF outside of source tree. 
Update headers and search paths with new build logic.
 2011-05-19 09:21:18 +02:00
Romain Muller 2a2761d354 Updates submodule to point to GitHub repository of LibGit2 
Updated submodule to libGit 0.12
 2011-05-19 09:21:18 +02:00
German Laullon 94efa431a6 conditionalize usage of 10.6-only protocols 
David Catmull (Uncommon)
Uncommon/gitx@e5b603f188

Conflicts:

	DBPrefsWindowController.h
	PBGitHistoryController.h
	PBGitSidebarController.h
	PBGitWindowController.h
 2011-05-19 00:01:49 +02:00
German Laullon 2f828bb165 Correct new repos history. 2011-05-18 23:45:35 +02:00
German Laullon 4432997fb1 [GH-15] disappearing history 2011-05-18 17:30:19 +02:00
German Laullon 502f218f15 Merge pull request #56 from nerdrew/master 
Enable multiline git config values.
 2011-05-18 01:48:27 -07:00
German Laullon 52b587a1de Merge pull request #52 from darconeous/error-on-repo-open-fix 
Error on repo open fix
 2011-05-18 01:45:36 -07:00
German Laullon f4631533d7 Merge pull request #59 from victor/master 
Allow the project to be built in directories with spaces in the path nam...
 2011-05-18 01:40:43 -07:00
German Laullon 4205333d26 Merge pull request #54 from RomainMuller/fix 
GitX 0.8.2 does not like first commits
 2011-05-18 01:33:04 -07:00
David Catmull 7806e64990 help tags for remotes now work 2011-05-14 23:16:57 -06:00
David Catmull 1d24c1dff3 hook up helpText; works with tags 2011-05-14 10:53:42 -06:00
David Catmull 43e3d46b13 helpTextForRef 2011-05-14 10:43:26 -06:00
Victor Jalencas 104681c6c0 Allow the project to be built in directories with spaces in the path name (such as an AFP share mounted as /Network/Servers/servername/Volumes/Macintosh HD/Networkusers/username/…) 2011-05-13 07:44:01 -07:00
David Catmull b0090ce004 help text member 2011-05-12 08:10:23 -06:00
Andrew Ryan 1f73579993 Don't crash with multiline gitconfig values. 
Use `git config -l -z` to get configs.
 2011-05-10 13:23:26 -04:00
Romain Muller e546078dd9 Fixed issue with the initial commit by adding --root in diff-tree arguments. 2011-05-09 22:38:17 -07:00
Romain Muller 12bb9623a4 NULL-safe escapeHTML: 2011-05-09 22:19:06 -07:00
German Laullon fb6abc7de7 get back the old gitx_asskpasswd v0.8.2 2011-05-08 19:51:40 -07:00
Uwe Hees 3c3b9ad6e1 Merge branch 'refs/heads/fix_diff_parser' 2011-05-08 12:59:16 +02:00
Uwe Hees f02cdd8cfc Fix line numbering of plus lines from merge diffs. 2011-05-08 12:58:46 +02:00
Robert Quattlebaum f2fc162350 Make reloadRefs realize when something has gone horribly wrong. 2011-05-07 11:23:44 -07:00
Robert Quattlebaum 9e140f1a7d Report an error when an attempt to open a repo throws something. 2011-05-07 11:23:37 -07:00
Uwe Hees f5039d6db1 Merge branch 'refs/heads/fix_diff_parser' 2011-05-07 11:40:54 +02:00
Uwe Hees 2e3cdd2e05 Remove debug output of the hunk html. 2011-05-07 11:34:06 +02:00
Uwe Hees d36f441e38 Parse diff hunks from merge diffs, continued. 
Show differences from all anecstors. Each ancestor is represented by a seperate line numer column.
 2011-05-07 11:29:47 +02:00
Uwe Hees 2541fb53cc Merge remote-tracking branch 'refs/remotes/laullon/master' 2011-05-07 09:08:16 +02:00
Uwe Hees 62b6dba983 Parse diff hunks from merge diffs. 
For now only the differences to the first parent are shown.
 2011-05-07 09:07:04 +02:00
Uwe Hees a67e25c426 Parse merge diffs. 
These diffs begin with "diff --cc" and have "@@@" as block sepeartors.
 2011-05-06 10:17:32 +02:00
German Laullon 02d04c2862 NSSecureTextField 2011-05-05 16:45:15 -07:00
German Laullon ca9b4f2d41 new AskPasswd 2011-05-05 16:43:17 -07:00
Uwe Hees 092418439c Set compiler to LLVM GCC4.2 and build archs to Standard (32bit universal) for the Debug target 2011-05-05 17:55:42 +02:00
Uwe Hees 43ac202144 Merge remote-tracking branch 'refs/remotes/laullon/master' 2011-05-05 11:55:21 +02:00
German Laullon f45ca2791b some cleanup pre 0.8.2 2011-05-03 16:58:33 -07:00
Uwe Hees d6c37bae55 Merge remote-tracking branch 'laullon/master' 2011-05-03 08:23:22 +02:00
Uwe Hees e3304fa838 [GH-24] Fix a bug in stageFile/unstageFile with multiple files 2011-05-02 12:28:36 -07:00