From: Pratyush Yadav <me@yadavpratyush.com>
Date: Thu, 5 Dec 2019 18:55:27 +0000 (+0530)
Subject: Merge branch 'jg/revert-untracked'
X-Git-Tag: v2.25.0-rc2~6^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=276353004822918d1f45cfc36d0717b878fff600;p=thirdparty%2Fgit.git

Merge branch 'jg/revert-untracked'

git-gui learned to delete untracked files when the "Revert Changes"
option is selected. Since there are two types of revert operations (one
for tracked files and one for untracked ones), the "checkout" and
"deletion" operations are done in parallel. The status bar is updated
to allow both to use it in parallel.

* jg/revert-untracked:
  git-gui: revert untracked files by deleting them
  git-gui: update status bar to track operations
  git-gui: consolidate naming conventions
---

276353004822918d1f45cfc36d0717b878fff600