I have installed Beyond Compare and want to use it as both merge and diff tool inside Gitkraken.
When I select any of the modified files, it still uses the default Gitkraken diff view... I know it does say merge tool in the settings, but there must be a way to specify a diff tool too, right?
This is now a working feature on GitKraken. On the commit details pane, if you right click on a file, it gives the option of opening in the external tool.
GitKraken 7.4.0:
File -> Preferences -> General -> External Diff Tool
Related
I sometimes realize a local commit with Eclipse and then decide to push my project but Eclipse offers me only two solutions "Commit and Push" or "Commit".
The problem is I cannot make a "commit and push" if I haven't changed anything after my "Commit".
Fair enough, I only have to change a line on my code and can push it but it seems to me like an awkward solution. Is there a better way to do so?
You can always just open Eclipse's built-in terminal (or any other terminal app) and execute: git push.
On a side note: getting used to using git on the command line enables you to easily switch between different IDEs and editors without having to re-learn the respective quirks of the git integration of the IDE de jour every time you switch.
In the Package Explorer, Project Explorer, etc. right-click the project folder and choose Team > Push to Upstream.
Alternatively, you can use Quick Access (Ctrl+3) and enter push to upstream (assuming a file of a Git repository is selected or opened).
For a Git main menu and Git icons in the main toolbar, in Window > Perspective > Customize Perspective..., in the tab Action Set Availability check the checkbox Git.
I am using Source tree client for Git on windows 7. I have used beyond compare with tortoisehg client for mercurial and I like to use Beyond compare itself as diff too in SourceTree too. I set the diff tool to beyond compare in Tools -> Options but not sure how to launch diff too via source tree for any file. Double click on file should usually bring up diff view. Right-click -> Custom action also does nothing.
Beyond compare 3.3.13 & source tree 2.1.2.5
Please let me know how to configure this.
It works for me:
After the installation, check whether you have set this in SourceTree options:
Right click on the file(s) you want to compare and fire up Beyond Compare:
Beyond Compare 4.2.2 & SourceTree 2.1.2.5
Also please make sure your Beyond Compare trial period has not ended
In addition of the file compare/merge, I use the sourcetree custom actions in order to compare two commits as folder comparison.
Assuming git & beyond compare in the PATH, you can add this following custom action in Sourcetree (Tools > Option > Custom Actions):
Script: git
Parameters: difftool -d --tool=bc4 $SHA
Tested with Sourcetree 3.4.8, git 2.35, beyond compare 4.4.2
The following worked for me in few easy steps:
Configured git to use beyond control as the diff and merge tools as per official documentation.
https://www.scootersoftware.com/support.php?zz=kb_vcs#gitwindows
Setup sourcetree custom command enabling diff using Beyond compare by selecting two commits similar to TortoiseHG.
SourceTree->Tools->Options->Custom Actions
Script to run: git
Parameters: difftool --dir-diff $SHA
We are working with Git and Eclipse. If I'm opening the merge tool to resolve a conflict I get this dialog:
I want to change this afer I marked Don't ask again before. But just cannot find the correct preference page.
Where can I change this after the dialog does not show up anymore?
You can change this in Eclipse Git preferences. Go to Window -> Preferences -> Team -> Git and there is dropdown for Merge Merge tool content.
I'm using Eclipse Indigo SR2 with the (built-in) EGit plugin v.1.3.0.201202151440-r and haven't been able to find any way to easily review all my changes before making a commit.
I used Eclipse with SVN for years, and this was always very easy to do. I would typically right-click on my project, select Team->Synchronize, double-click on the first changed file (in the Team Sync perspective), then hit Ctrl-. repeatedly to review all changes in one file, and then proceed to the next file, as I wrote a summary of my changes for the commit message.
But of course, git is very different from Subversion, and so my workflow must change. With EGit, "Team Sync" only appears to be useful for reviewing changes between my local files and the remote repository (i.e. before a push to the remote). I need a way to review changes since my last commit to my local repository. I generally don't even care to (re)review changes before a push to remote (and if I did, I'd prefer a simple equivalent of git log to see what commits I'm about to push).
If I right-click on my project and select Team->Commit, I am presented with a window that does almost everything I need to do (select files to stage, commit, write a commit message, amend a previous commit, etc.). What it doesn't allow me to do is quickly and easily review all my changes in a compare editor. I can't believe this capability doesn't exist! It seems I am required to double-click on each individual file, review the changes, close the compare editor, and double-click on the next file. That's ridiculous!
TL/DR - I am looking for a simple GUI equivalent (in Eclipse) to do what I am easily able to do from the command line using git vimdiff (where vimdiff is a git alias that uses vimdiff as the "difftool" to cycle through all modified files) followed by git commit (with perhaps a git add or two in between).
If no one has a good solution, I am curious about how others handle their commit workflow with EGit. I've been getting along fine committing from the command line (not that Eclipse is happy about that) but I can't believe that EGit is as near-useless as it seems to me. Perhaps my google-fu is not as strong as it once was?
Says here that you can see the diffs between the working tree and any given reference. Perhaps you should try out the latest version (Juno) of Eclipse/EGit and see if it's gotten any better?
Update: I've tried this out in the latest Eclipse, and as far as I can see it works fine. Here's how:
In the moment of writing this, Eclipse Juno 4.2 is the version you should go for. On the download page, you can pick between several packages according to your needs. The 'Eclipse IDE for Java Developers' comes bundled with EGit, but you can also install EGit into any distribution using the Eclipse Marketplace (under the Help menu).
Once you've imported your project into Eclipse, make sure the project is "shared":
Right-click project -> Team -> Share Project.. -> Git
Now do the following:
Switch to the Team Synchronizing Perspective.
Click the little synchronize button in the Synchronize View.
Choose Git
Pick a suitable branch to sync against, like refs/remotes/origin/master
Make sure to check the "Include local uncommitted changes in comparison" box
Click Finish
Now, change some files and watch them appear in the Synchronize View. Double-click the changed files to see the diff (like in the screenshot below).
Are you aware of the 'Git Staging' view. It keeps track of all the files that have changed and you can review the changes any time. (This can be a bit better than using the commit dialog)
An alternative is to commit all changes without reviewing, and then use the history view to compare two commits (Simply select the last top most commits, right click and select 'Compare with each other'). This way you do not have to keep double clicking individual files. If you need to change something you can always 'Amend' the last commit. (I usually follow this approach)
I am writing this as of Eclipse Oxygen, but it should apply to other versions as well.
Option 1 with team synchronizing view: right click the project > Compare with > Commit. You can choose your latest commit here, even if you haven't pushed it to repository.
Option 2 with diff view: If you want to see the "diff" version without committing, you can achieve this by right clicking your project > team > stashes > Stash Changes > check Include untracked files. This will save all of your changes to a stash. Then you will right click project > team > stashes > select stash you saved. You click the green arrow at the top right to re-apply all of your changes you stashed back to your code. In the same stash window, you will see a "Diff" tab at the bottom right. Clicking on the diff tab will show your changes in the red/green highlighted diff style. I wish there was a way to generate a diff view without stashing, but this is the only work-around I have found.
I'm using Subclipse 3.0.0 and set my quick diff settings to be against "Prestine SVN copy".
However when I make a commit using the menu option Team -> Commit I still see the old changes coloured in my left side ruller where the line numbers are.
Doing a Refresh on the source tree does not help either. I have to manually close all the opened source files and re-open them for the quick diff to update.
From what I see the reference "Prestine SVN copy" only gets updated when you open a file that is not currently opened. Is there any way to fix this?
In Eclipse, to do SVN clean up
Right Click on Project -> Team -> Refresh/Cleanup option
You also can refer to this to add a keyboard shortcut for this command