Supply the same filename as argument to two commands

On a git conflict, I can currently do: git diff path/to/some/file.txt … after reviewing the diff, usually I want to do: git checkout –theirs path/to/some/file.txt && git add path/to/some/file.txt It’s painstaking to edit both paths each time, so I’d like to be able to do the following: git checkout –theirs <ref> && git add path/to/some/file.txt … Read more

Simplest way to password protect a directory and its contents without having to create new files?

I would like to password protect or encrypt a directory and all the files within it (for the whole directory tree below it). I do not want to bother the whole home directory, I want a specific directory with some files and folders in it. I would like to be able to encrypt the directory or decrypt it using a password. Command line would be nicest to use. I don’t want to have to create a new file as an encrypted version and then, delete the previous ones which are the non-encrypted version.