Permalink
Commits on May 11, 2011
  1. Merge remote-tracking branches 'darco/error-on-repo-open-fix', 'romai…

    …nmuller/fix', 'romainmuller/improvements', 'nerdrew/master' and 'boxed/master' into HEAD
    
    Conflicts:
    	English.lproj/RepositoryWindow.xib
    	GitX.xcodeproj/project.pbxproj
    	PBGitWindowController.m
    
    Merge command:
        git merge darco/error-on-repo-open-fix romainmuller/fix \
    	romainmuller/improvements nerdrew/master boxed/master \
    	--rerere-autoupdate
    committed May 11, 2011
Commits on May 10, 2011
  1. Don't crash with multiline gitconfig values.

    Use `git config -l -z` to get configs.
    nerdrew committed May 10, 2011
  2. NULL-safe escapeHTML:

    RomainMuller committed May 10, 2011
Commits on May 9, 2011
  1. Updated .gitignore.

    committed May 9, 2011
Commits on May 8, 2011
  1. 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.
    uhees committed with RomainMuller Apr 18, 2011
Commits on May 7, 2011
  1. Parse diff hunks from merge diffs, continued.

    Show differences from all anecstors. Each ancestor is represented by a seperate line numer column.
    uhees committed May 7, 2011
  2. Parse diff hunks from merge diffs.

    For now only the differences to the first parent are shown.
    uhees committed May 7, 2011
Commits on May 6, 2011
  1. Parse merge diffs.

    These diffs begin with "diff --cc" and have "@@@" as block sepeartors.
    uhees committed May 6, 2011
Commits on May 5, 2011
  1. NSSecureTextField

    laullon committed May 5, 2011
  2. new AskPasswd

    laullon committed May 5, 2011
  3. Set compiler to LLVM GCC4.2 and build archs to Standard (32bit univer…

    …sal) for the Debug target
    uhees committed May 5, 2011
Commits on May 3, 2011
  1. some cleanup pre 0.8.2

    laullon committed May 3, 2011
Commits on May 2, 2011
  1. Merge pull request #46 from RomainMuller/pull_request.

    Several improvements
    * Editable toolbar
    * Hidden SVN controls when no SVN remote
    * Escaped HTML in commit comment.
    laullon committed May 2, 2011
Commits on May 1, 2011
Commits on Apr 30, 2011
  1. 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...
    RomainMuller committed Apr 30, 2011
  2. Make the toolbar editable.

    RomainMuller committed Apr 30, 2011
Commits on Apr 29, 2011
  1. Merged pull request #43 from alinx/gui-refresh.

    Using iTerm2 as an option
    laullon committed Apr 29, 2011
Commits on Apr 28, 2011