feat: add include untracked opt on discard (fix #1586)#1588

heartacker wants to merge 2 commits intosourcegit-scm:developsourcegit-scm/sourcegit:developfrom

heartacker:dev/#1586heartacker/sourcegit:dev/#1586Copy head branch name to clipboard