Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More explicit edit features #22

Open
adiroiban opened this issue Feb 7, 2013 · 2 comments
Open

More explicit edit features #22

adiroiban opened this issue Feb 7, 2013 · 2 comments

Comments

@adiroiban
Copy link

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!

@wmanley
Copy link
Owner

wmanley commented Feb 10, 2013

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)

@adiroiban
Copy link
Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants