git status/diff filter

# diff  show file name only  

lake@local:~/local/git-aosp-AndroidN7.1.x$ git diff       e15e9cde9bcae86cbb541da26127b0372ec140f2    --name-only
build/target/product/base.mk
build/target/product/generic_no_telephony.mk
build/target/product/sdk_base.mk
device/amlogic/common/sepolicy/accelerateboot.te
frameworks/base/core/res/res/values/config.xml 

In merge

Show unmerged files only 

 git diff --name-status --diff-filter=U

X          Y     Meaning
-------------------------------------------------
	 [AMD]   not updated
M        [ MD]   updated in index
A        [ MD]   added to index
D                deleted from index
R        [ MD]   renamed in index
C        [ MD]   copied in index
[MARC]           index and work tree matches
[ MARC]     M    work tree changed since index
[ MARC]     D    deleted in work tree
[ D]        R    renamed in work tree
[ D]        C    copied in work tree
-------------------------------------------------
D           D    unmerged, both deleted
A           U    unmerged, added by us
U           D    unmerged, deleted by them
U           A    unmerged, added by them
D           U    unmerged, deleted by us
A           A    unmerged, both added
U           U    unmerged, both modified
-------------------------------------------------
?           ?    untracked
!           !    ignored

  git diff --name-status  

[lake@localbuildroot]$ git diff  master   HEAD   --name-status       --  package/weston              A       package/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch
D       package/weston/0001-tests-include-fcntl.h-for-open-O_RDWR-O_CLOEXEC-and-.patch
D       package/weston/0002-libweston-backend-drm-might-need-EGL.patch
A       package/weston/0002-shared-struct-timespec-is-in-time.h.patch
D       package/weston/0003-pipewire-add-support-for-0.3-API.patch
D       package/weston/0004-pipewire-fix-null-deref-in-0-3-API.patch
M       package/weston/Config.in
M       package/weston/weston.hash
M       package/weston/weston.mk
[lhu3@zch127bld08 buildroot]$

### filter sub folders 

XXXX

XXXX@XXX:~/local/git-aosp-AndroidN7.1.x$ git diff  635a736b0442b277e47582753df1fc5367a21e3a     37cb9af77ba8dd020f5b2ac167835d567f1a5f04     --name-only   -- device   |awk  -F   "/"   '{if(NF=3)  print $1"/"$2}'    |uniq
device/asus
device/generic
device/google
device/htc
device/huawei
device/intel
device/lge
device/linaro
device/moto
device/qcom
jhula@ShSwDev2:~/local/git-aosp-AndroidN7.1.x$