> For the complete documentation index, see [llms.txt](https://wiki.dewaka.com/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://wiki.dewaka.com/source-control/git.md).

# Git

## Tools

* [Magit - A Git Porcelain inside Emacs](https://magit.vc) - this is probably

  the best git tool to quickly get work done if you are already married to the

  Emacs ecosystem.

## Tips

* Undoing a `git add` before commit -

  <https://stackoverflow.com/questions/348170/how-do-i-undo-git-add-before-commit>.
* Removing untracked files - <https://koukia.ca/how-to-remove-local-untracked-files-from-the-current-git-branch-571c6ce9b6b1>
  * `git clean -n` - to check which files will be deleted.
  * `git clean -f` - to delete untracked files.
* Rebase remote master - <https://stackoverflow.com/questions/7929369/how-to-rebase-local-branch-with-remote-master/18442755>,

  ```bash
  git fetch origin            # Updates origin/master
  git rebase origin/master    # Rebases current branch onto origin/master
  ```

  This can be done in one step - `git pull --rebase origin master`
* Undoing a git rebase - <https://stackoverflow.com/questions/134882/undoing-a-git-rebase>.


---

# Agent Instructions
This documentation is published with GitBook. GitBook is the documentation platform designed so that both humans and AI agents can read, navigate, and reason over technical content effectively. Learn more at gitbook.com.

## Querying This Documentation
If you need additional information that is not directly available in this page, you can query the documentation dynamically by asking a question.

Perform an HTTP GET request on the current page URL with the `ask` query parameter, and the optional `goal` query parameter:

```
GET https://wiki.dewaka.com/source-control/git.md?ask=<question>&goal=<endgoal>
```

`ask` is the immediate question: it should be specific, self-contained, and written in natural language.
`goal` is optional and describes the broader end goal you are ultimately trying to accomplish on behalf of the user. GitBook uses it to tailor the answer towards what is most useful for that goal.

The response will contain a direct answer to the question and relevant excerpts and sources from the documentation.

Use this mechanism when the answer is not explicitly present in the current page, you need clarification or additional context, or you want to retrieve related documentation sections.