Here a simple snippet to merge a local branch excluding a file.
This is case “myfile.txt”
git merge --no-ff --no-commit <merge-branch>
git reset HEAD myfile.txt
git checkout -- myfile.txt
git commit -m "merged <merge-branch>"Categories: Bash
Bash
SSH tunneling
SSH (Secure Shell) tunneling is a technique that lets you securely forward network traffic through an encrypted SSH connection. It’s essentially a way to “pipe” otherwise insecure or restricted traffic through an SSH session, protecting Read more…
0 Comments