4432997fb1
[GH-15] disappearing history
2011-05-18 17:30:19 +02:00
502f218f15
Merge pull request #56 from nerdrew/master
...
Enable multiline git config values.
2011-05-18 01:48:27 -07:00
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
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
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
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
1f73579993
Don't crash with multiline gitconfig values.
...
Use `git config -l -z` to get configs.
2011-05-10 13:23:26 -04:00
e546078dd9
Fixed issue with the initial commit by adding --root in diff-tree arguments.
2011-05-09 22:38:17 -07:00
12bb9623a4
NULL-safe escapeHTML:
2011-05-09 22:19:06 -07:00
fb6abc7de7
get back the old gitx_asskpasswd
2011-05-08 19:51:40 -07:00
3c3b9ad6e1
Merge branch 'refs/heads/fix_diff_parser'
2011-05-08 12:59:16 +02:00
f02cdd8cfc
Fix line numbering of plus lines from merge diffs.
2011-05-08 12:58:46 +02:00
f2fc162350
Make reloadRefs realize when something has gone horribly wrong.
2011-05-07 11:23:44 -07:00
9e140f1a7d
Report an error when an attempt to open a repo throws something.
2011-05-07 11:23:37 -07:00
f5039d6db1
Merge branch 'refs/heads/fix_diff_parser'
2011-05-07 11:40:54 +02:00
2e3cdd2e05
Remove debug output of the hunk html.
2011-05-07 11:34:06 +02:00
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
2541fb53cc
Merge remote-tracking branch 'refs/remotes/laullon/master'
2011-05-07 09:08:16 +02:00
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
a67e25c426
Parse merge diffs.
...
These diffs begin with "diff --cc" and have "@@@" as block sepeartors.
2011-05-06 10:17:32 +02:00
02d04c2862
NSSecureTextField
2011-05-05 16:45:15 -07:00
ca9b4f2d41
new AskPasswd
2011-05-05 16:43:17 -07:00
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
43ac202144
Merge remote-tracking branch 'refs/remotes/laullon/master'
2011-05-05 11:55:21 +02:00
f45ca2791b
some cleanup pre 0.8.2
2011-05-03 16:58:33 -07:00
d6c37bae55
Merge remote-tracking branch 'laullon/master'
2011-05-03 08:23:22 +02:00
e3304fa838
[GH-24] Fix a bug in stageFile/unstageFile with multiple files
2011-05-02 12:28:36 -07:00
940e09d686
Merge pull request #46 from RomainMuller/pull_request.
...
Several improvements
* Editable toolbar
* Hidden SVN controls when no SVN remote
* Escaped HTML in commit comment.
2011-05-02 09:41:43 -07:00
636068cb33
Merge remote-tracking branch 'laullon/master'
2011-05-02 09:18:17 +02:00
e05be3b4bf
Use setHidden: instead of setTrasnparent:
2011-05-01 13:49:31 -07:00
7d82aa0761
Rename cleanupHTML: to escapeHTML:
2011-05-01 13:49:15 -07:00
3f416bb8e7
Tidy up the commit message to ensure it won't break the diff view.
...
Renamed the GLFileView's +parseHTML into something more meaningful regarding what it actually does.
Also, the method might need to be moved to somewhere else...
2011-04-30 13:16:22 -07:00
a775582c00
Make the toolbar editable.
2011-04-30 12:07:08 -07:00
e3559c924c
Hide SVN controls if repository doesn't have a SVN remote instead of only disabling them.
2011-04-30 12:06:41 -07:00
d609816789
Merged pull request #43 from alinx/gui-refresh.
...
Using iTerm2 as an option
2011-04-29 15:18:49 -07:00
1490db8396
Merge branch 'master' into gui-refresh
2011-04-29 22:01:03 +02:00
5e9210d2c2
[laullon/gitx GH-41] Open in FileMerge link doesn't always work
2011-04-28 10:12:56 -07:00
bb46584b56
Fix a bug in stageFile/unstageFile with multiple files
2011-04-27 23:29:17 +02:00
7d3a7e14a7
Reset the selectedCommitBeforeCommit after revisions update.
...
This fixes a bug where selecting a branch in the sidebar did not select the branch head in the revision list.
2011-04-27 23:28:42 +02:00
5fc5929e2f
Follow name changes when searching for file paths to get the full history.
2011-04-27 23:27:15 +02:00
ff1cf329b1
Make property accessor backward compatible
2011-04-27 23:15:36 +02:00
b1cd163c98
Comment out delegate declarations that are only present in 10.6
2011-04-27 23:13:46 +02:00
f478476df7
Set compiler to LLVM GCC4.2 and build archs to Standard (32bit universal)
2011-04-27 23:12:47 +02:00
f6e69682d1
better hide/show splitviews
2011-04-22 15:48:19 -07:00
cc10bda032
openFileMerge on "diff with..."
2011-04-22 15:47:02 -07:00
09011b82e9
avoid unnecessary reloads
2011-04-20 12:51:24 -07:00
e109d03a4d
Better file view search
2011-04-20 12:20:24 -07:00
602b7d462d
remove syntaxhighlighter_2.1.364
2011-04-18 15:41:16 -07:00
68f3fda7c9
Merge branch 'master' of https://github.com/avanderberg/gitx into avanderberg-master
2011-04-18 15:08:29 -07:00
7911b67656
[8] Repos initialized with git-svn break the app
2011-04-18 14:48:08 -07:00
German Laullon