Git merge branch excluding file

Published by Tito on

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

0 Comments

Leave a Reply

Avatar placeholder

Your email address will not be published.

Related Posts

Bash

Flameshot

Flameshot is a powerful and simple-to-use screenshot software Here a mini guide to install and setup in ubuntu 24.04 LTS, XDG wayland Install Flameshot on startup go to startup application select flameshot and press edit Read more…

Bash

Setup OpenVPN in 10 minutes

Few steps to setup in 10 minutes a OpenVPN server inside a Docker in your VPS. Requirements Docker Docker compose Docker compose setup note: static-network is optional, just in case you would like to access Read more…

Bash

nc – netcat

The nc (or netcat) utility is used for just about anything under the sun involving TCP, UDP, or UNIX-domain sockets. It can open TCP connections, send UDP packets, listen on arbitrary TCP and UDP ports, Read more…