{"title":"Reset Modes (soft, mixed, hard)","description":null,"content":"When it comes to managing your Git repository, knowing how to reset your changes can be a lifesaver. \n\nYou might find yourself in situations where you realize that your latest commits, staged changes, or even edits in your working directory are not quite what you intended. \n\nThis is where Git's `reset` command shines, particularly through its three main modes: **soft**, **mixed**, and **hard**.\n\nUnderstanding these modes will empower you to manipulate your commit history and working state confidently, without fear of irreversible mistakes.\n\n---\n\n# Understanding Reset Modes\n\nBefore diving into the specifics of each reset mode, let's clarify what the `git reset` command does at a high level. Essentially, it changes the current branch’s HEAD pointer to a specified state. Depending on the mode you choose, it also affects the staging area and the working directory.\n\nHere’s a simple overview of how the three modes differ:\n\n- **Soft Reset**: Moves the HEAD pointer and leaves the staging area and working directory untouched.\n- **Mixed Reset**: Moves the HEAD pointer, resets the staging area to match the specified commit, but leaves the working directory intact.\n- **Hard Reset**: Moves the HEAD pointer and resets both the staging area and working directory to match the specified commit.\n\nUnderstanding these differences will help you choose the right mode for your situation.\n\n---\n\n# Soft Reset\n\nThe soft reset is often your first choice when you want to undo commits while keeping your changes intact for further editing or staging.\n\n### What It Does\n\nA soft reset moves the HEAD to a specified commit, making it the new current commit. However, it leaves all your changes in the staging area, which means you can easily modify them or create new commits.\n\n### Command Syntax\n\n\n```shell\n$ git reset --soft \n```\n\n\n### Practical Example\n\nImagine you’ve made several commits, but you realize that the last two commits were not what you wanted. You want to merge those changes into a single commit.\n\nFirst, check your commit history to determine how many commits you want to undo:\n\n\n```shell\n$ git log --oneline\n```\n\n\nSuppose you see the following:\n\n\n```shell\na1b2c3d (HEAD -> main) Fix typo in documentation\n e4f5g6h Add new feature\n i7j8k9l Initial commit\n```\n\n\nYou can use a soft reset to move back to the initial commit:\n\n\n```shell\n$ git reset --soft i7j8k9l\n```\n\n\nAfter running this command, your changes from both the \"Add new feature\" and \"Fix typo in documentation\" commits will be staged, allowing you to modify them as you see fit.\n\n### Why Use Soft Reset?\n\n- **Convenience**: It allows you to combine multiple changes into a single commit, which helps maintain a cleaner commit history.\n- **Flexibility**: You can rework your changes before re-committing them, making it easier to get things just right.\n\n---\n\n# Mixed Reset\n\nThe mixed reset is the default mode of `git reset` and is particularly useful when you want to unstage changes while keeping your working directory intact.\n\n### What It Does\n\nA mixed reset will move the HEAD pointer and reset the staging area to match a specified commit, but it will not alter your working directory. Your changes will remain in the working directory but will no longer be staged.\n\n### Command Syntax\n\n\n```shell\n$ git reset --mixed \n```\n\n\n### Practical Example\n\nSuppose you’ve added several files to the staging area but realize that you only want to commit specific changes. Here’s how you can use a mixed reset:\n\nStage some files:\n\n\n```shell\n$ git add file1.txt file2.txt file3.txt\n```\n\n\nUse `git status` to confirm they are staged:\n\n\n```shell\nOn branch main\n Changes to be committed:\n - file1.txt\n - file2.txt\n - file3.txt\n```\n\n\nIf you decide to unstage `file2.txt`, run:\n\n\n```shell\n$ git reset --mixed HEAD\n```\n\n\nAfter this, `file1.txt` and `file3.txt` will remain staged, but `file2.txt` will be unstaged and left in your working directory.\n\n### Why Use Mixed Reset?\n\n- **Unstage Changes**: It allows you to selectively unstage files without losing your changes.\n- **Refine Your Commits**: If you realize you’ve staged too many changes, a mixed reset helps you refine what you want to commit.\n\n---\n\n# Hard Reset\n\nThe hard reset is the most aggressive option available and should be used with caution. It’s handy when you want to completely discard changes made since a specified commit.\n\n### What It Does\n\nA hard reset moves the HEAD pointer, resets the staging area, and resets the working directory to match the state of the specified commit. This means all your changes will be lost unless you have them backed up elsewhere.\n\n### Command Syntax\n\n\n```shell\n$ git reset --hard \n```\n\n\n### Practical Example\n\nConsider a scenario where you’ve been working on a feature and have staged and committed changes. However, you decide that the entire feature is not needed anymore.\n\nCheck your commit history:\n\n\n```shell\n$ git log --oneline\n```\n\n\nYou see a commit hash you want to reset to, for example, `i7j8k9l` (the initial commit). To perform a hard reset, execute:\n\n\n```shell\n$ git reset --hard i7j8k9l\n```\n\n\nAfter this command, your working directory and staging area will match the state of the initial commit. All changes made after will be permanently lost.\n\n### Why Use Hard Reset?\n\n- **Complete Revert**: It allows you to completely discard unwanted changes, making it useful for cleaning up mistakes.\n- **Start Fresh**: If a branch has diverged significantly from the desired path, a hard reset can help realign it.\n\n\n> **WARNING**\n>\n> Be very careful when using `git reset --hard`. Since it permanently deletes changes, always ensure that you have backups or that you're certain about discarding those changes.\n\n\n---\n\n# Choosing the Right Reset Mode\n\nChoosing between soft, mixed, and hard resets depends on your specific needs. Here’s a quick guide to help you decide:\n\n#### **Use Soft Reset When**:\n\n- You want to combine multiple commits into one.\n- You need to edit your last commit(s) without losing changes.\n\n#### **Use Mixed Reset When**:\n\n- You want to unstage files while keeping changes in your working directory.\n- You need to refine what you’re committing.\n\n#### **Use Hard Reset When**:\n\n- You want to discard all changes since a certain commit.\n- You are confident that you no longer need your current changes.\n\n---\n\n# Visualizing Reset Modes\n\nUnderstanding how each reset mode affects the commit graph can reinforce your mental model of Git operations. Here’s a simplified view of how the different resets affect your commit history:\n\n\n```shell\nStarting point: HEAD and main at D\n\nA -- B -- C -- D (HEAD, main)\n\ngit reset --soft C (move HEAD/main, keep changes STAGED)\n\nA -- B -- C (HEAD, main)\n\t\t\\\n\t\t\tD (changes from C..D are in STAGING AREA)\n\n------------\n\ngit reset --mixed C (move HEAD/main, keep changes only in WORKING DIR)\n\nA -- B -- C (HEAD, main)\n\t\t\\\n\t\t\tD (changes from C..D are in WORKING DIRECTORY, UNSTAGED)\n\n------------\n\ngit reset --hard C (move HEAD/main, DISCARD changes from C..D)\n\nA -- B -- C (HEAD, main)\n\nD is no longer in branch history,\n```\n\n\nIn this diagram:\n\n- The soft reset allows you to return to the initial commit while keeping changes for later adjustment.\n- The mixed reset lets you return to the second commit, unstage changes while keeping them in the working directory.\n- The hard reset returns you to the initial state and removes all subsequent changes.\n\n---\n\nHaving explored the different reset modes, you’re now ready to dive into the concept of `git revert`. This command provides a safer way to undo changes by creating new commits, helping you maintain a clear commit history while addressing mistakes.\n\nIn the next chapter, we will discover how to use `git revert` to effectively manage unwanted changes.","pageType":"git"}

Reset Modes (soft, mixed, hard)

Get Premium