| @@ -0,0 +1,11 @@ | |||
| 1 | + | # diff | |
| 2 | + | ||
| 3 | + | * recursive diff between two file trees, ignoring any which don't exist on either side (two methods): | |
| 4 | + | ||
| 5 | + | `git diff --diff-filter=MR file1 file2` | |
| 6 | + | ||
| 7 | + | `git diff --diff-filter=CMRTXB file1 file2` | |
| 8 | + | ||
| 9 | + | * diff local and remote file: | |
| 10 | + | ||
| 11 | + | `diff foo <(ssh $server 'cat foo')` | |
simon revised this gist 1 month ago · cc61d32
1 file changed, 11 insertions