13a4fd693f
merging krasnyk/stashes branch to soundevolution/svn
...
Merge branch 'refs/heads/stashes' into testing
Conflicts:
GitX.xcodeproj/project.pbxproj
PBGitHistoryView.xib
PBGitSidebarView.xib
2011-01-06 01:48:19 +08:00
a3bba2e19c
Merge commit '0a3b60066c0662c4097e2d1db22e95fb1080abb9' into testing
...
Conflicts:
GitX.xcodeproj/project.pbxproj
2011-01-06 01:09:16 +08:00
51d56b983e
correct libgit2 submodule. ??
2011-01-06 00:59:26 +08:00
33e21e2604
Added new icons for file status. When untracked file is
...
added to index than it has added file icon.
2010-11-29 00:10:17 +01:00
cb59e86a81
Deleted stash commands from ref menu
2010-11-28 23:38:10 +01:00
7deb309dbb
Merge branch 'refs/heads/experimental' into stashes
...
Conflicts:
GitX.xcodeproj/project.pbxproj
PBGitCommitView.xib
PBGitHistoryView.xib
PBRefController.m
2010-11-28 23:33:06 +01:00
27e490c405
Reset now asks user for confirmation
2010-11-28 22:57:40 +01:00
71e9e2cc43
Added action to reveal submodule path
2010-11-28 21:16:19 +01:00
b948127cc2
Added command for initializing submodules
2010-11-28 21:13:43 +01:00
81bb83a0da
Showing submodule actions only when possible
2010-11-28 21:06:09 +01:00
e3ed9ad9b0
Added double click action on a module
2010-11-28 21:05:41 +01:00
be507c8230
- Added controller 4 stashes, submodules, reset management
...
- Added additional menu for the repository actions
- Added action for 'Revealing in Finder'
2010-11-28 00:41:27 +01:00
f12187338e
submodules are now nested
2010-11-28 00:38:52 +01:00
40e3d8eb2d
commented unused code
2010-11-28 00:38:32 +01:00
1fd08761d1
Commented out unneeded code
2010-11-27 17:25:57 +01:00
9de4b4cfbd
History view shows file's icons
2010-11-27 17:25:27 +01:00
17a4935f66
OutlineView for the sidebar menu can be now tacked
...
Commit on CMD+ENTER
Added images for group items in sidebar menu
2010-11-25 20:35:37 +01:00
f383103652
Submodules can be updated/updated recursively
2010-11-25 20:28:15 +01:00
7570afee69
Commands can be now disabled
2010-11-25 20:27:32 +01:00
9dd29f6048
Fix creating Gists
...
GitHub changed their site to use SSL.
On error GitHub may return the "All Gists" page which will have several "gist: #", so check for the edit link instead.
2010-11-17 19:53:29 -07:00
b41da9e23e
Fix the File/Tree view's vertical split view
...
It will now remember it's position and the divider will not move when the window resizes.
2010-11-17 19:53:25 -07:00
c545832108
Fix the Stage view's horizontal split view
...
It will now remember it's position and the divider will keep its position relative to the bottom when the window resizes.
2010-11-17 19:53:22 -07:00
b11d4f7485
Fix the history view's horizontal split view
...
Save the position correctly (it wasn't saving before). Restore the position sometime after awakeFromNib otherwise the superview's size will not have been set yet.
Also constrain the divider from moving unless the lower view is too small.
2010-11-17 19:53:18 -07:00
621b4e6bc8
Use Command-U for the Clone menu item
2010-11-17 19:53:09 -07:00
d91ed3d8c3
set state (checkmark) on view menu items to reflect active view
2010-11-17 19:50:55 -07:00
395877f005
explicitly disable external diff so we get the results we need even if the user has an external diff configured
2010-11-17 19:50:51 -07:00
62319b8cd9
Allow suppressing some of the modal warnings
...
This allows the user to suppress the display of some of the warning dialogs (like "Confirm before Push"). They can be reset with Reset Warnings in the General preferences.
2010-11-17 19:50:48 -07:00
e168123c0e
Draw commit message line more accurately
...
When drawing the commit message line, the given rect should not be used
for anything other than clipping. According to the comment, the code that
draws the line relies on the text view always drawing complete lines.
However, it also draws fragments, specifically when the insertion point
is flashing. By ignoring the given rect, not only is our line more accurate
in its positioning, but we also handle the case where the insertion point
is sitting on top of the line.
2010-11-17 19:50:40 -07:00
7123fd6519
Add a "Report a problem" item to the Help menu
...
Opens the GitX Lighthouse page.
2010-11-14 17:59:11 -07:00
0807099dc3
Send the CFBundleGitVersion string along with the other sparkle profile info
2010-11-14 17:59:03 -07:00
515b66f09a
Fix memory leaks
2010-11-14 17:58:48 -07:00
cc5c93c2b6
- stashes can be created with optional message
...
- added clearing all stashes
- added possibility to ignore files with given extension
- submodules are now showed
- submodules can be opened
2010-11-07 23:37:41 +01:00
896df91b4f
Ignored hidden temp files
2010-11-06 13:21:04 +01:00
0a3b60066c
Stashes are shown on in Side controlle
2010-11-06 13:20:13 +01:00
e067385125
connecting ui buttons to methods.
2010-10-26 06:35:35 +10:00
be0716ad0d
Adding code to do "git svn fetch/rebase/dcommit"
2010-10-26 06:35:14 +10:00
042289a785
Updating XIB files with SVN fetch/rebase/dcommit buttons.
2010-10-22 07:02:22 +10:00
be373b0ace
Adding code to support SVN fetch,rebase,dcommit buttons and sensing of svn-remote configuration in repository. No implementation of git svn commands yet, just code for the buttons.
2010-10-22 07:01:55 +10:00
d2c7cfc0d8
merge to master
2010-09-27 11:45:33 -07:00
cad928126e
merger brotherbard:experimetal
2010-09-24 10:25:12 -07:00
a78a2c238c
blame cosmetics
...
save the html for debug and CSS edit
2010-09-24 10:17:04 -07:00
59c4983b51
Bugfix: only exit the handleSTDINDiff() if there is an actual diff
2010-09-20 22:36:06 -06:00
d00dbe42b3
Always pull all tracking branches from the remote
...
'git pull remote branch' will not update the remote's tracking branches, only the selected local branch. It may not be readily apparent that this happened. So remove the cases where GitX would pull just a single branch and always pull all the tracking branches.
The current checked out branch will still be updated as normal.
2010-09-19 22:51:14 -06:00
e388434a49
When creating a tracking branch pre-fill the branch name in the create branch sheet
2010-09-19 22:49:44 -06:00
929f9fc0f5
Show the branch that will be tracked when creating a tracking branch
2010-09-19 22:49:37 -06:00
6f83f2382c
Bugfix: Rebasing the head ref
...
Only use the ref being rebased onto otherwise git will create a detached HEAD.
2010-09-19 14:33:33 -06:00
cbf7cd3fbf
cosmetic
2010-09-19 13:18:40 -07:00
6cf9cc13c8
SyntaxHighlighter 3.0.83
2010-09-19 13:01:26 -07:00
bcee4aa91e
html and code parse errors...
2010-09-19 12:17:18 -07:00
9a9de9577c
Bugfix: crasher on 10.5 due to webkit and the <button> element
...
Something in webkit doesn't like the button html element nor the -webkit-appearance: button css tag. Ends up crashing in one of various WebCore::ThemeMac::paint functions.
This would crash for anyone on 10.5 with the Gist it button enabled (which it is by default so that means anyone who ran it for the first time).
Changing the button back to the way it was before SHA:b557d6b5c6e675216d340d20833f39d0096b7ccc
2010-09-18 19:17:12 -06:00
Adi Luhung Suryadi