# Git commands & workflows

## Git commands and workflows

* [Rebase](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) - Instead of creating a merge commit to merge a feature from a different branch, we "rebase and merge" the branch to keep a clean commit history. Please read more about how to use it [here](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase).
* [Cherry pick](https://www.atlassian.com/git/tutorials/cherry-pick)
* [`commit --amend`](https://www.atlassian.com/git/tutorials/rewriting-history) - To change the last commit
* `push -f`

## Git GUI aid

* [Android Studio/IntelliJ git UI](https://www.jetbrains.com/help/idea/investigate-changes.html)
* [Gitkraken Git Client](https://gitkraken.com/git-client)
* [SourceTree](https://www.sourcetreeapp.com/)
* [Github Desktop](https://desktop.github.com/)


---

# Agent Instructions: 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:

```
GET https://engineering.obvious.in/release-engineering/git-commands-workflows.md?ask=<question>
```

The question should be specific, self-contained, and written in natural language.
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.