Re: [PATCH/RFC v3 00/14] Introduce new commands switch-branch and restore-files

2018-11-29 Thread Dan Fabulich
Other thoughts on a global UI rethink: One of the most common complaints I hear about git is the conceptual difficulty required in undoing changes. https://ohshitgit.com/ > Git is hard: screwing up is easy, and figuring out how to fix your mistakes > is fucking impossible. Git documentation has

Re: [PATCH/RFC v3 00/14] Introduce new commands switch-branch and restore-files

2018-11-29 Thread Dan Fabulich
Assuming the great day has come to think about this, one thing I'd love to do is to unify the name of the index/stage/cache in command-line parameters and the documentation. The index/stage/cache should have one canonical name, and the documentation should support that consistently. My taste is

Why does git-checkout accept a tree-ish?

2017-04-05 Thread Dan Fabulich
I was looking back through git's history, trying to figure out why git-checkout has so many features. I was struck by this commit by Junio in 2005. https://github.com/git/git/commit/4aaa702794447d9b281dd22fe532fd61e02434e1 > git-checkout: revert specific paths to either index or a given tree-ish

Re: Bug report: OS X git-merge deletes recapitalized files when rename detection fails

2013-10-21 Thread Dan Fabulich
> On Thu, Oct 10, 2013 at 05:46 PM, Dan Fabulich wrote: >> On case-insensitive filesystems, git-merge deletes files that were >> recapitalized in another branch if rename detection fails. >> >> To repro: Run this script with git 1.8.4 on a case-insensitive filesystem. &

Bug report: OS X git-merge deletes recapitalized files when rename detection fails

2013-10-10 Thread Dan Fabulich
; According to git-status, the deletion is not yet staged. Expected: There should be no untracked changes at the end of this script. The script runs as expected on Linux or case-sensitive HFS. -Dan Fabulich P.S. On case-insensitive HFS, git-init will automatically set core.ignorecase to true. Fo