If I create a tag by highlighting a specific commit in the "History" view it works fine. But if I try to create a tag for a specific commit using the "Git Repositories" view as shown below, it fails. The "Advanced" drop-down arrow necessary to select the specific commit I want to tag does nothing. Is this feature not implemented yet? Is it in the works for EGit v3.1?
Note: I don't have a Eclipse project created yet. So I don't have a "Team" menu item. But I tried creating one and the result is the same - the advanced arrow doesn't work.
Create a new repo on Github (initialized with a readme.)
Clone the repo with EGit.
Make a commit on the master branch.
From the Git Repositories View in EGit:
Right-click the item "Tags"
Select the menu item "Create Tag..."
In the "Create New Tag" dialog box that opens up, enter a tag name, and tag message.
The "Advanced" drop-down arrow does nothing.
Resize the window after clicking on Advanced. After that, you should see a dropdown to select the commit to tag.
This was an issue in EGit, see bug 352830. It's fixed in EGit 3.0.2 and 3.1 (not yet released).
Related
I can't find the Stashes (nor REMOTES, BRANCHES, FILE HISTORY) menu in the Source Control (the one you open up with Ctrl-Shift-U) tool bar.
This is how my Visual Studio Code looks like:
And this is a picture I found on the web with the menu options I'd like to restore:
I couldn't find an option to restore these menu options.
it seems like somehow GitLens, instead of replacing the Source Control panel, add his own:
You need to install (or enable if you have it disabled) the GitLens extension. That is what adds those sub-sections seen in your second screenshot.
Alternatively, if you click the ellipsis that is to the right of each of your repositories, you should see a "Stash" menu item that should also meet most of your needs.
Note that the GitLens extension is apart of the Git Extension Pack extension, which contains a few other extensions as well (including Git History, which you appear to have already).
Just for reference, in case anybody else stumbles upon this issue.
I created this issue at GitLens github repo and the solution was to right click on the original 'Source Control' icon and select the option "Reset location"
It seems it's not the first time that something like this happened.
Now I have commit dialog in dock mode:
Version 2019.2 EAP
From https://blog.jetbrains.com/webstorm/2019/06/webstorm-2019-2-eap-4/
In WebStorm 2019.2, we are merging the Commit dialog with the Local Changes tab. That way, the commit action can nicely fit in the flow of reviewing the changes you’ve made in this tab. And you can always jump back to the editor, whereas with the old Commit dialog you had to close it first.
The familiar Commit shortcut (Cmd/Ctrl-K) will now select all the modified files for the commit and focus on the Commit message field.
Solution:
We understand that this new feature can affect your current familiar workflow. If you’d like to switch back to the old Commit dialog, simply deselect the Commit from the Local Changes without showing a dialog checkbox in Settings/Preferences | Version Control | Commit Dialog.
In latest Version it now,
Settings > Version Control > Commit ,
Uncheck first option "Use non-modal commit interface"
You probably know this window where you can see the diffs between a commit to ONE commit older.
Do you know how can I see exactly the same comparison, but between a commit and a previous commit which is not necessarily ONE before the current one.
I know that I can do it per one file, but I want to do it for the whole project.
You can select any number of commits in the git log window (using shift/ctrl and click or cursor keys) and the right-hand pane will show the cumulated differences.
In IntelliJ, there is no command or action to compare exact revisions, unfortunately.
Here are couple related requests:
https://youtrack.jetbrains.com/issue/IDEA-125616 and https://youtrack.jetbrains.com/issue/IDEA-100431
However, there is a way to see what has changed between two commits. To do so you need to go to the Version control - Log tab and select the entire range between wanted commits (e.g select the later commit, then scroll down to the older commit and click on it with Shift). In the right pane showing changed files you will see all the changes.
Another way to do it:
Open the 1: Project panel
Right-click your project's root folder
Select Git → Show History from the menu
This opens up a completely different view of the git log, where you can do exactly what you'd expect to be able to from the main (9: Version Control) git log... namely:
Select (only!) two commits
Click Compare
From the pop-up dialog that appears, you can select any file and press Ctrl-/Cmd-D (or right-click and select the only menu item) to see the changes.
Unfortunately, there doesn't seem to be any way to "pin" that view to your workspace, though it hovers on top as long as you need it.
Hopefully one day JetBrains will create a "best of both worlds" merged version of these UIs, so we can just compare stuff from the main Version Control log. To add to the list of JetBrains tickets for this issue listed in another answer... the oldest one appears to be https://youtrack.jetbrains.com/issue/IDEA-86480
Also in CLion (I think in other JetBrains IDE-s it's the same):
open VCS log
filter VCS log via other branch (e.g., personal/sherstennikov/krt-23941)
top n commits must be the range on other branch we want to diff against current branch
select other branch HEAD with left click
right click on it
select in menu 'Branch ' (e.g.: Branch 'personal/sherstennikov/krt-23941')
expand via arrow on the right and click 'Compare with Current'
you get a window (see pic) 'Comparing with in root '
top left pane contains range of commits from other-branch
bottom left pane contains log of current-branch
right pane contains list-of-files-which-differ between commit/several-selected-commits (if range selected, list of files is cumulative) in other-branch and HEAD (or maybe selection) in current-branch
now you can click on file in right pane to get it's diff between selected versions in a separate window (let's call it file-diff-between-other-and-current-window)
10.also in file-diff-between-other-and-current-window right on the left of unified/side-by-side viewer selector, there's a control to switch between files in the aforementioned list-of-files-which-differ
I know this is a foolish question. When I do a git compare (Project -> Right click -> Compare with), comparison opens in Synchronization panel instead of Compare window panel.
I am unable to understand git synchronization and thus not able to compare my branches.
I don't want git synchronization window panel. I need a git compare tree panel.
Please Help
The synchronization (since Egit 3.1) is for the difference between the working tree (including not committed changes) and a branch or tag.
As mentioned in "Compare editor and Synchronize View":
If you use any of the submenu actions of Compare With on a single file, a compare editor will be shown, otherwise (since EGit 3.1) the Synchronize View will be opened that lets you browse the changes;
by double-clicking on a changed file in this view, a compare editor will be opened for this file.
In the toolbar of the Synchronize View you can select the Sychronize Model you want to use for presenting the changes you are inspecting.
To get only a compare view, you can also follow the section "Compare working tree with last commit":
The difference between a resource in the current working directory and in the last commit in the current branch can be viewed from the context menu Compare With > HEAD revision.
This feature is also available in the Commit dialog.
Double clicking on an entry in the Commit dialog opens a compare dialog.
Is there a way to get the git log, ie: "Team -> Show in History" appear as a menu item on the main menu bar and to have a shortcut for it?
I'd like this menu item/shortcut to work when selecting a project or project resource in Package Explorer.
You could use Shift+Alt+W (that brings up the Show In submenu) and then press H to activate the History entry.
Otherwise, you can also consider linking the History view to the selection by activating the toolbar icon with the two arrows in the History view.
The command "Team -> Show History" cannot be processed unless it's associated with a module or a folder.
That's why it's a right click menu option.
You should be able to bind the Show In (History) command to a key in the Preferences>General>Keys page. You have to select something before you execute it (like a git repo or a project in the explorer).