git-meld icon indicating copy to clipboard operation
git-meld copied to clipboard

More explicit edit features

Open adiroiban opened this issue 12 years ago • 2 comments

Hi,

At the first read of README I was not sure if git-meld will also apply changes for working dir. This is a great feature.

Maybe the usage line can be updated to:

git meld uses "git diff --name-only" to extract the files that have changed between the two commits and then makes a copy of these files into a temporary directory before invoking meld on these copies. At exit, files modified in the temporary directory for working_dir are applied to the actual working folder.

Thanks for the great tool!

adiroiban avatar Feb 07 '13 11:02 adiroiban

I'm afraid this would be inaccurate. Git meld uses symlinks such that when you are editing a file in your working directory in meld you are actually editing the files in your working directory (e.g. no copying back happens)

wmanley avatar Feb 10 '13 19:02 wmanley

Hi,

Thanks for the update.

What do you say about this description:

git meld uses "git diff --name-only" to extract the files that have changed between the two commits and then makes a copy of these files into a temporary directory before invoking meld on these copies.

The files from current working folder are symlinked into the the temporary folder, so any changes performed on these files are automatically saved. All other files are copied in the temporary folder with read only permissions.

Thanks

adiroiban avatar Feb 11 '13 06:02 adiroiban