Permalink
Commits on Apr 11, 2010
  1. Allow zero lines of context

    epall committed Apr 11, 2010
    Hunk/line patches don't generally have context
    
    Before this, every attempt to stage a hunk or line was met with
    "patch failed" using git 1.6.6
Commits on Mar 13, 2010
Commits on Feb 21, 2010
Commits on Feb 19, 2010
  1. Set the environment variables for our tool. We have a rudimentary but…

    uliwitness committed Feb 19, 2010
    … working password panel now. Prettification later.
  2. First stab at an executable that can be put into the SSH_ASKPASS envi…

    uliwitness committed Feb 19, 2010
    …ronment variable to make GitX ask for passwords.
Commits on Dec 5, 2009
  1. Bugfix: replace the standard error in the pipe .

    brotherbard committed Dec 5, 2009
    This was not the cause of the errors.
Commits on Dec 3, 2009
  1. Update toolbar icons.

    brotherbard committed Dec 3, 2009
    Updated icons for Checkout, Rebase, Fetch, Pull, Push
    - All icons are now the same size
    - The discloser triangle is now completely in the bottom right corner
    - Remade the Rebase icon to better match the others
  2. Add Merge.

    brotherbard committed Dec 3, 2009
    - PBGitRepository: add merge with branch and commit
    - Add merge to contextual menus for refs and commits
    - Add Merge toolbar item with drop down menu
    - Add Merge icon (created by Nathan Kinsinger but based on the Add Remote icon by Kim Does)
    - Modified the default toolbar icon set, replaced Rebase with Merge
  3. Debugging: Add standard input to debug messages.

    brotherbard committed Dec 3, 2009
    Debugging messages can be enabled from the commandline with:
    defaults write nl.frim.GitX "Show Debug Messages" -bool yes
    
    And disabled with:
    defaults write nl.frim.GitX "Show Debug Messages" -bool no
Commits on Dec 2, 2009
  1. Bugfix: Allow staging hunks that have a warning.

    brotherbard committed Dec 2, 2009
    Staging a hunk may cause git to show a warning like "trailing whitespace". Don't include those with the standard output or GitX thinks there is a real error.
  2. Bugfix: Update the history controller after changes.

    brotherbard committed Dec 2, 2009
    After an operation that can change the commit history, update the history controller.
  3. Bugfix: Stop window disappearing after errors.

    brotherbard committed Dec 2, 2009
    When there is an error while discarding a hunk or a file, the repository window would disappear. Close the previous sheet before opening a new error sheet.
  4. Add remotes to menus for Fetch, Push and Pull.

    brotherbard committed Dec 2, 2009
    - Modified the Fetch, Push and Pull commands in PBGitRepository.m to accept a remote and operate on all tracking branches for that remote.
    - Moved the menu creation code to PBRefMenuItem and some refactoring.
    - The Fetch, Push and Pull toolbar items are disabled when there are no remotes setup in the repository.
    - Updated the tooltips for Fetch, Push and Pull.
Commits on Dec 1, 2009
  1. KBPopUpToolbarItem: fix icon display when changing size.

    brotherbard committed Dec 1, 2009
    IB does not use setImage: (it must set the image to the ivar directly) and so the regularImage and smallImage ivars are not set. This causes the icon to be blank when the user changes the size.
    
    Since the size of the image is set in IB also don't use the default size that KBPopUpToolbarItem uses. Instead allow the toolbar item to resize the image automatically.
Commits on Nov 20, 2009
  1. Bugfix: Update the history view when doing rebase or other commands.

    brotherbard committed Nov 20, 2009
    When using All Branches or Local Branches the history view would not be updated if the commnad changed the history.
    
    closes #1
Commits on Nov 19, 2009
  1. Bugfix: Update the toolbar menus when the branch changes.

    brotherbard committed Nov 19, 2009
    Reported by Sam Minnee in LH ticket #221.
  2. Switch Add Remote to be cmd-Shift-R because Refresh is already cmd-R.

    brotherbard committed Nov 19, 2009
    Pointed out by Sam Minnee in ticket #221.
Commits on Nov 18, 2009
  1. Fix rebasing on a commit.

    brotherbard committed Nov 18, 2009
  2. PBGitCommit: Improve isOnSameBranchAs: detection.

    brotherbard committed Nov 18, 2009
    Now it will not include commits that are ahead of the existing commit.
    
    So, given commits A->B->C, A is in C's branch but C is not in A's.
Commits on Nov 16, 2009
  1. Refactor PBRefController (and friends).

    brotherbard committed Nov 16, 2009
    -- Simplify methods
    -- Reorganize methods
    -- Rename methods
    -- Move actions that modify the document to the document (PBGitRepository)
    -- Add several convience methods to get needed information and to make things more readable
    -- Added NSErrors and presetError:(BOOL) options to many git actions
    -- Actually make things do what I thought I had told them to do before
  2. Add a preference for showing/hiding and setting the location of the c…

    brotherbard committed Nov 14, 2009
    …olumn guide in the commit message text view.
  3. Fix for the occasional "Remote host closed connection" exception whil…

    brotherbard committed Nov 14, 2009
    …e looking at files in the file browser.
    
    Seems to happen more when running in XCode than when running by itself. This randomly causes the contents view to be empty or the files to not be shown when clicking a discloser triangle.
    
    EINTR errors are recoverable, just need to read() again.