From: "Jonathan Gilbert via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Gilbert <rcq8n2xf3v@liamekaens.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/1] Allow the 'revert' option in Git Gui to operate on untracked files, deleting them
Date: Mon, 28 Oct 2019 18:58:06 +0000 [thread overview]
Message-ID: <pull.423.git.1572289087.gitgitgadget@gmail.com> (raw)
My development environment sometimes makes automatic changes that I don't
want to keep. In some cases, this involves new files being added that I
don't want to commit or keep. I have typically had to explicitly delete
those files externally to Git Gui, and I want to be able to just select
those newly-created untracked files and "revert" them into oblivion.
This change updates the revert_helper function to check for untracked files
as well as changes, and then any changes to be reverted and untracked files
are handled by independent blocks of code. The user is prompted
independently for untracked files, since the underlying action is
fundamentally different (rm -f). If after deleting untracked files, the
directory containing them becomes empty, then the directory is removed as
well.
This introduces new strings in index.tcl. I have been told that there is a
separate process whereby the translations get updated.
Jonathan Gilbert (1):
git-gui: Revert untracked files by deleting them
git-gui/lib/index.tcl | 139 +++++++++++++++++++++++++++++++-----------
1 file changed, 104 insertions(+), 35 deletions(-)
base-commit: 566a1439f6f56c2171b8853ddbca0ad3f5098770
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-423%2Flogiclrd%2Fgit-gui-revert-untracked-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-423/logiclrd/git-gui-revert-untracked-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/423
--
gitgitgadget
next reply other threads:[~2019-10-28 18:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 18:58 Jonathan Gilbert via GitGitGadget [this message]
2019-10-28 18:58 ` [PATCH 1/1] git-gui: Revert untracked files by deleting them Jonathan Gilbert via GitGitGadget
2019-10-29 21:27 ` Pratyush Yadav
2019-10-29 23:52 ` Jonathan Gilbert
2019-10-29 0:12 ` [PATCH 0/1] Allow the 'revert' option in Git Gui to operate on untracked files, " brian m. carlson
2019-10-29 1:45 ` Jonathan Gilbert
2019-10-29 14:29 ` Bert Wesarg
2019-10-29 20:25 ` Jonathan Gilbert
2019-10-29 20:33 ` Jonathan Gilbert
2019-10-29 21:43 ` Pratyush Yadav
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.423.git.1572289087.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rcq8n2xf3v@liamekaens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).