Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

May 11, 2011

  1. Robert Quattlebaum

    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
    authored

May 10, 2011

  1. Andrew Ryan Lazarus

    Don't crash with multiline gitconfig values.

    Use `git config -l -z` to get configs.
    nerdrew authored
  2. Romain Muller

    Fixed issue with the initial commit by adding --root in diff-tree arg…

    …uments.
  3. Romain Muller

    NULL-safe escapeHTML:

May 09, 2011

  1. Robert Quattlebaum

    Updated .gitignore.

    authored
  2. German Laullon

    get back the old gitx_asskpasswd

    laullon authored

May 08, 2011

  1. Uwe Hees

    Merge branch 'refs/heads/fix_diff_parser'

    uhees authored
  2. Uwe Hees

    Fix line numbering of plus lines from merge diffs.

    uhees authored
  3. Uwe Hees

    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 authored RomainMuller committed
  4. Uwe Hees

    Follow name changes when searching for file paths to get the full his…

    …tory.
    uhees authored RomainMuller committed

May 07, 2011

  1. Robert Quattlebaum

    Make reloadRefs realize when something has gone horribly wrong.

    authored
  2. Robert Quattlebaum

    Report an error when an attempt to open a repo throws something.

    authored
  3. Uwe Hees

    Merge branch 'refs/heads/fix_diff_parser'

    uhees authored
  4. Uwe Hees

    Remove debug output of the hunk html.

    uhees authored
  5. Uwe Hees

    Parse diff hunks from merge diffs, continued.

    Show differences from all anecstors. Each ancestor is represented by a seperate line numer column.
    uhees authored
  6. Uwe Hees

    Merge remote-tracking branch 'refs/remotes/laullon/master'

    uhees authored
  7. Uwe Hees

    Parse diff hunks from merge diffs.

    For now only the differences to the first parent are shown.
    uhees authored

May 06, 2011

  1. Uwe Hees

    Parse merge diffs.

    These diffs begin with "diff --cc" and have "@@@" as block sepeartors.
    uhees authored

May 05, 2011

  1. German Laullon

    NSSecureTextField

    laullon authored
  2. German Laullon

    new AskPasswd

    laullon authored
  3. Uwe Hees

    Set compiler to LLVM GCC4.2 and build archs to Standard (32bit univer…

    …sal) for the Debug target
    uhees authored
  4. Uwe Hees

    Merge remote-tracking branch 'refs/remotes/laullon/master'

    uhees authored

May 03, 2011

  1. German Laullon

    some cleanup pre 0.8.2

    laullon authored
  2. Uwe Hees

    Merge remote-tracking branch 'laullon/master'

    uhees authored

May 02, 2011

  1. Uwe Hees

    [GH-24] Fix a bug in stageFile/unstageFile with multiple files

    uhees authored laullon committed
  2. German Laullon

    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 authored
  3. Uwe Hees

    Merge remote-tracking branch 'laullon/master'

    uhees authored

May 01, 2011

  1. Romain Muller

    Use setHidden: instead of setTrasnparent:

  2. Romain Muller

    Rename cleanupHTML: to escapeHTML:

Apr 30, 2011

  1. Romain Muller

    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 authored
  2. Romain Muller

    Make the toolbar editable.

    RomainMuller authored
  3. Romain Muller

    Hide SVN controls if repository doesn't have a SVN remote instead of …

    …only disabling them.
    RomainMuller authored

Apr 29, 2011

  1. German Laullon

    Merged pull request #43 from alinx/gui-refresh.

    Using iTerm2 as an option
    laullon authored
  2. Alex Brand

    Merge branch 'master' into gui-refresh

    alinx authored

Apr 28, 2011

  1. German Laullon

    [laullon/gitx GH-41] Open in FileMerge link doesn't always work

    laullon authored
Something went wrong with that request. Please try again.