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
Stat
Stat Command Overview The stat command displays detailed file or filesystem status information. It’s commonly used by developers and sysadmins to inspect metadata such as permissions, ownership, timestamps, and filesystem-specific attributes. Synopsis Key Options Default Read more…
0 Comments