Skip to main content

Git–Discard local changes

Git offers a wide range of possibilities to discard local changes. In this post I like to share some of the available options. Before I dive into the details, it is important to make the distinction between untracked and tracked files.

From the documentation:

Git has something called the "staging area" or "index". This is an intermediate area where commits can be formatted and reviewed before completing the commit.

 

Untracked files live in the git working directory but are not managed by git until you stage them.

Tracked files

Here are some options to discard changes in tracked files:

  1. Discard Changes in a Specific File: If you want to discard changes in a specific file, you can use the following command:

    git checkout -- filename

    This will replace the changes in the specified file with the last committed version of that file.

  2. Discard Changes in All Modified Files: To discard changes in all modified files in the working directory, you can use the following command:

        git checkout -- .

    The . specifies the current directory, and this command will discard changes in all modified files.

  3. Discard Uncommitted Changes and Switch Branch: If you want to switch branches and discard any uncommitted changes, you can use the following command:   

    git checkout -f branch_name

    Replace branch_name with the name of the branch you want to switch to. The -f (or --force) option is used to discard changes.

  4. Stash Changes: Another option is to use Git stash to save your changes temporarily, switch to a different branch, and then apply or drop the stash based on your needs:

    # Save changes to a stash
    git stash
    # Switch to a different branch
    git checkout branch_name
    # Apply the stash to the new branch if needed
    git stash apply
    # Or, if you don't need the stash anymore
    git stash drop

Untracked files

If you have untracked files that you want to remove, you can use the git clean command. Be cautious with this command, as it permanently deletes untracked files.

git clean -f

The -f (force) option is required to perform the clean operation.

If you want to remove both untracked files and directories, you can use the -d option:

git clean -fd

Always be careful when using git clean as it permanently deletes untracked files, and there's no easy way to recover them.

If you want to remove untracked files from the working directory but keep them in the repository (i.e., you don't want them to be tracked), you can use the following command:

git clean -fX

This will remove only the untracked files but not untracked directories. The -X option tells Git to remove only the files that are not listed in the .gitignore file.

Labels:

Popular posts from this blog

.NET 8–Keyed/Named Services

A feature that a lot of IoC container libraries support but that was missing in the default DI container provided by Microsoft is the support for Keyed or Named Services. This feature allows you to register the same type multiple times using different names, allowing you to resolve a specific instance based on the circumstances. Although there is some controversy if supporting this feature is a good idea or not, it certainly can be handy. To support this feature a new interface IKeyedServiceProvider got introduced in .NET 8 providing 2 new methods on our ServiceProvider instance: object? GetKeyedService(Type serviceType, object? serviceKey); object GetRequiredKeyedService(Type serviceType, object? serviceKey); To use it, we need to register our service using one of the new extension methods: Resolving the service can be done either through the FromKeyedServices attribute: or by injecting the IKeyedServiceProvider interface and calling the GetRequiredKeyedServic...
Read more

Azure DevOps/ GitHub emoji

I’m really bad at remembering emoji’s. So here is cheat sheet with all emoji’s that can be used in tools that support the github emoji markdown markup: All credits go to rcaviers who created this list.
Read more

Kubernetes–Limit your environmental impact

Reducing the carbon footprint and CO2 emission of our (cloud) workloads, is a responsibility of all of us. If you are running a Kubernetes cluster, have a look at Kube-Green . kube-green is a simple Kubernetes operator that automatically shuts down (some of) your pods when you don't need them. A single pod produces about 11 Kg CO2eq per year( here the calculation). Reason enough to give it a try! Installing kube-green in your cluster The easiest way to install the operator in your cluster is through kubectl. We first need to install a cert-manager: kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.5/cert-manager.yaml Remark: Wait a minute before you continue as it can take some time before the cert-manager is up & running inside your cluster. Now we can install the kube-green operator: kubectl apply -f https://github.com/kube-green/kube-green/releases/latest/download/kube-green.yaml Now in the namespace where we want t...
Read more