Holger, > Remove SD in P1, make a logical link from P2 to SD, add SD to > .git/info/exclude Thanks for your quick reply. That's what I have tested but... > (see "Bug report - local (and git ignored) file silently removed after > checkout" on the mailing list why exclude is better than .gitignore at > the moment) Seems like this is working only if file names are different. This is not my case as the replacement is very similar. With the following script I'm expecting empty status and no diff: << #!/bin/sh # create sd (directory that will replace src2) mkdir sd echo sd1 > sd/file1 echo sd2 > sd/file2 # create Git repo mkdir repo cd repo git init mkdir src1 mkdir src2 echo file > src1/file echo 3 > src2/file3 git add . git ci -a -m "first" # let's replace src2 by sd rm -fr src2 # ln -s ../sd src2 cp -r ../sd src2 # make sure src2 is excluded echo 'src2/*' >> .git/info/exclude # the following output should be clean echo '============== Status' git status echo '============== Diff' git diff >> But the output is actually: Initialized empty Git repository in /home/obry/tmp/repo/.git/ [master (root-commit) 527c7a1] first 2 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 src1/file create mode 100644 src2/file3 cp: cannot stat `../src': No such file or directory ============== Status # On branch master # Changes not staged for commit: # (use "git add/rm <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # deleted: src2/file3 # no changes added to commit (use "git add" and/or "git commit -a") ============== Diff diff --git a/src2/file3 b/src2/file3 deleted file mode 100644 index 00750ed..0000000 --- a/src2/file3 +++ /dev/null @@ -1 +0,0 @@ -3 Any other idea? Thanks. -- --|------------------------------------------------------ --| Pascal Obry Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --| http://www.obry.net - http://v2p.fr.eu.org --| "The best way to travel is by means of imagination" --| --| gpg --keyserver keys.gnupg.net --recv-key F949BD3B -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html