Advertisement
SnarlingFox

Untitled

Nov 22nd, 2023
63
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.00 KB | None | 0 0
  1. # git log --oneline
  2. 0f283ab4c9 (HEAD -> device/zyxel-wsq50-wsq60, origin/main, origin/HEAD, main) umdns: update to Git HEAD (2023-11-21)
  3. 0f283ab4c9 (HEAD -> device/zyxel-wsq50-wsq60, origin/main, origin/HEAD, main) umdns: update to Git HEAD (2023-11-21)
  4. 33f4013bf2 udebug: update to Git HEAD (2023-11-20)
  5. cafb961850 netifd: update to Git HEAD (2023-11-20), adds udebug support
  6. 2634d3f855 uboot-envtools: add settings for Synology DS213j
  7. 3f7637b050 mvebu: add support for Synology DS213j
  8. 2723f16dda hostapd: add missing acl entries for udebug
  9. 4cd31d6c7c ubus: update to Git HEAD (2023-11-14)
  10. effc305cda hostapd: add udebug support
  11. bc6ee34c97 udebug: add new package
  12. c4fe1bfc65 ramips: D-Link Dxx-1xx0 image fixes
  13. ...
  14.  
  15. # git status
  16. On branch device/zyxel-wsq50-wsq60
  17. Your branch is behind 'origin/device/zyxel-wsq50-wsq60' by 15 commits, and can be fast-forwarded.
  18. (use "git pull" to update your local branch)
  19.  
  20. You are currently cherry-picking commit dca76e84f6.
  21. (fix conflicts and run "git cherry-pick --continue")
  22. (use "git cherry-pick --skip" to skip this patch)
  23. (use "git cherry-pick --abort" to cancel the cherry-pick operation)
  24.  
  25. Unmerged paths:
  26. (use "git add/rm <file>..." as appropriate to mark resolution)
  27. both modified: package/boot/uboot-envtools/files/ipq40xx
  28. both modified: package/firmware/ipq-wifi/Makefile
  29. both modified: target/linux/ipq40xx/base-files/etc/board.d/02_network
  30. both modified: target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
  31. both modified: target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh
  32. both modified: target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
  33. deleted by us: target/linux/ipq40xx/base-files/lib/upgrade/zyxel.sh
  34. added by them: target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-wsq50.dts
  35. both modified: target/linux/ipq40xx/image/generic.mk
  36.  
  37. no changes added to commit (use "git add" and/or "git commit -a")
  38.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement