222848 2021-03-05 19:00:47 -0800 Add git-webkit revert <file-path> 2022-07-09 11:50:22 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified NEW https://bugs.webkit.org/show_bug.cgi?id=215862 InRadar P2 Normal --- 239082 1 rniwa webkit-unassigned bdakin ggaren jbedard webkit-bug-importer oldest_to_newest 1736709 0 rniwa 2021-03-05 19:00:47 -0800 It's really counterintuitive that we'd have to reset the file and then checkout in order to revert local changes in Git. We should add git-webkit revert <file-path> to emulate svn revert. 1737093 1 webkit-bug-importer 2021-03-08 08:32:24 -0800 <rdar://problem/75171248> 1737102 2 jbedard 2021-03-08 08:47:25 -0800 How would `git-webkit revert <file-path>` be different from `git checkout <file-path>`? `revert` is reserved for un-doing commits in git. 1737427 3 rniwa 2021-03-08 18:58:10 -0800 (In reply to Jonathan Bedard from comment #2) > How would `git-webkit revert <file-path>` be different from `git checkout > <file-path>`? `revert` is reserved for un-doing commits in git. It would be different in that it also unstaged commits. There is also difference in that when you're in a merge conflict, etc... this command can resolve the conflict as we picked theirs-full. As we discussed in slack, we can call this "discard" instead.