Etienne Samson
Etienne Samson
Our current merge code (which is only used when pulling at the moment), had a few issues with consistency : it does not respect the pulled branch merge preference. It...
This adds a wrapper for the simple `git_merge_file` & `git_merge_file_from_index`. This is somewhat a leftover from #664, because the implementation was already available in libgit2 as the latter, and thus...
I've had to use a worktree-ed repo, and I'm a GitX user, which uses Objective-Git. This is a complete work-in-progress, because I just wanted to be able to run against...
I'm filing that here for ease of documentation (since macOS is obviously the biggest user of the SecureTransport/CommonCrypto "backend" combination in libgit2-land). The reference implementation I started with is [here](https://github.com/keithduncan/libssh2/pull/2),...
Just discovered that issue, again, after sooo long 😜.
The menu code is still confused w.r.t to the `firstResponder`. Here I have `master` selected in the sidebar, which tracks `origin/master` (hence "Fetch “origin”", but the history view has the...
The underlying issue to #123 is that I have this in my .gitconfig : ``` [diff "exif"] binary = true textconv = exiftool ``` As all us long-time macOS-ers know,...
In the stage view, having a `+++/---` line counter in the header of the current diff would be nice.
After adding a directory to .gitignore, its subfiles were still appearing in the Stage table. It took a relaunch to fix itself.
Since we now have our own "canonical" GitX, should we switch bundle identifiers ? I was planning to bring the Travis releases into the party, but we'd be stepping all...