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]$
git diff --name-only
git diff --name-only --diff-filter=U
Show conflict files only
git diff --name-only --diff-filter=U
lake@localhost:~/local/git-aosp-AndroidN7.1.x$ git diff --name-only c3335b914942880ff09771eca29d458f7226e5bb -- bootable/
bootable/bootloader/lk/app/aboot/aboot.c
bootable/bootloader/lk/dev/gcdb/display/include/panel_ili9881c_720p_video.h
bootable/bootloader/lk/dev/gcdb/display/include/panel_ili9881c_720p_video_yifeng.h
bootable/bootloader/lk/dev/gcdb/display/include/panel_otm9605a_qhd_video.h
bootable/bootloader/lk/dev/gcdb/display/include/panel_st7703_720p_video.h
bootable/bootloader/lk/dev/gcdb/display/include/panel_st7703_720p_video_new.h
bootable/bootloader/lk/platform/msm_shared/debug.c
bootable/bootloader/lk/platform/msm_shared/mmc_sdhci.c
bootable/bootloader/lk/target/msm8909/oem_panel.c
lake@localhost:~/local/git-aosp-AndroidN7.1.x$ git diff --name-only c3335b914942880ff09771eca29d458f7226e5bb -- bootable/ |tr '\n' ' '
bootable/bootloader/lk/app/aboot/aboot.c bootable/bootloader/lk/dev/gcdb/display/include/panel_ili9881c_720p_video.h bootable/bootloader/lk/dev/gcdb/display/include/panel_ili9881c_720p_video_yifeng.h bootable/bootloader/lk/dev/gcdb/display/include/panel_otm9605a_qhd_video.h bootable/bootloader/lk/dev/gcdb/display/include/panel_st7703_720p_video.h bootable/bootloader/lk/dev/gcdb/display/include/panel_st7703_720p_video_new.h bootable/bootloader/lk/platform/msm_shared/debug.c bootable/bootloader/lk/platform/msm_shared/mmc_sdhci.c bootable/bootloader/lk/target/msm8909/oem_panel.c lake@localhost:~/local/git-aosp-AndroidN7.1.x$
lake@localhost:~/local/git-aosp-AndroidN7.1.x$
lake@localhost:~/local/git-aosp-AndroidN7.1.x$
