| commit | d491c7cad4e633b5829f24a1254950664b1ac492 | |
| author | Robin Stocker <robin@nibor.org> | |
| Wed, 14 Nov 2012 14:05:30 +0000 (14 15:05 +0100) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Thu, 28 Feb 2013 22:33:22 +0000 (28 23:33 +0100) | ||
| tree | 2b92977f06e67848859898f5b43aca971efb527b | treesnapshot (tar.gz zip) |
| parent | ad4cc959f859a493dd05054af6b8ce222a1425d3 | commitdiff |
[stagingView] Improve usability of "Replace with" on modified
The context menu actions "Replace with File in Git Index" and "Replace
with HEAD revision" in the unstaged changes table have the same result
for MODIFIED files. Showing both is redundant and can confuse newcomers.
Therefore remove the replace with index action, as the other is easier
to understand (the mental model of the user may be that the index only
contains changed files).
Both actions are still shown for PARTIALLY_MODIFIED, where they actually
cause different results.
Change-Id: I65601162f7ef506ea270933218601322fde1e929
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
The context menu actions "Replace with File in Git Index" and "Replace
with HEAD revision" in the unstaged changes table have the same result
for MODIFIED files. Showing both is redundant and can confuse newcomers.
Therefore remove the replace with index action, as the other is easier
to understand (the mental model of the user may be that the index only
contains changed files).
Both actions are still shown for PARTIALLY_MODIFIED, where they actually
cause different results.
Change-Id: I65601162f7ef506ea270933218601322fde1e929
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java | diffblobblamehistory |