This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 207165

Summary:	Diff between branches
Product:	versioncontrol	Reporter:	tskorka <tskorka>
Component:	Git	Assignee:	Ondrej Vrabec <ovrabec>
Status:	VERIFIED FIXED
Severity:	normal	CC:	git, lucapino, markiewb, tmswhite, tskorka
Priority:	P3	Keywords:	PLAN
Version:	7.1
Hardware:	PC
OS:	Windows Vista
Issue Type:	ENHANCEMENT	Exception Reporter:
Bug Depends on:	227348
Bug Blocks:	208930

Description tskorka 2012-01-11 10:36:01 UTC

Please add a feature which would allow to see a diff between any two GIT branches, or at least current branch and any other selected branch.
Currently I can't find any way to see changes before merging branches.

Related git command is:
git diff BRANCH1..BRANCH2

Comment 1 Ondrej Vrabec 2012-02-28 09:04:18 UTC

*** Bug 208930 has been marked as a duplicate of this bug. ***

Comment 2 markiewb 2013-02-12 09:32:27 UTC

Other usecases:
* git diff origin/master..master (compares local state to upstream state)
* git diff master..FETCH_HEAD (compares local state to state before merging)

Comment 3 Ondrej Vrabec 2013-04-02 14:49:35 UTC

fixed, i guess: core-main #aa6eb01b72d3

Comment 4 Martin Kanak 2013-06-18 11:10:40 UTC

verified 

Product Version: NetBeans IDE Dev (Build 201306162301)
Java: 1.7.0_25; Java HotSpot(TM) Client VM 23.25-b01
Runtime: Java(TM) SE Runtime Environment 1.7.0_25-b15
System: Linux version 3.5.0-28-generic running on i386; UTF-8; en_US (nb)