PCSX2 Documentation/Git Survival Guide: Difference between revisions
PCSX2 Documentation/Git Survival Guide (view source)
Revision as of 17:06, 19 July 2015
, 19 July 2015no edit summary
No edit summary |
No edit summary |
||
| (9 intermediate revisions by 2 users not shown) | |||
| Line 1: | Line 1: | ||
There are a | There are a lot of guides/docs on the internet but they are too big and confusing. You will find here a mini guide to use git with a minimal number of commands and parameters. You won't find any details or explications of git's internal mechanisms here. | ||
==Git Guide== | ==Git Guide== | ||
| Line 17: | Line 17: | ||
===Stash or how to save your precious work=== | ===Stash or how to save your precious work=== | ||
Stash is very useful. For example, | Stash is very useful. For example, you will use it before/after (push/pop) merge/rebase action | ||
* Push pending update on the stack: <code>git stash</code> | * Push pending update on the stack: <code>git stash</code> | ||
* Get back your update: <code>git stash pop</code> | * Get back your update: <code>git stash pop</code> | ||
| Line 34: | Line 34: | ||
* Switch to another branch: <code>git checkout <branch></code> | * Switch to another branch: <code>git checkout <branch></code> | ||
* Creates: git branch <code><branch></code> | * Creates: git branch <code><branch></code> | ||
* Delete branches: git branch -d | * Delete branches: <code>git branch -d <branch></code> | ||
* Set the base reference of the branch (for rebase): git branch --set-upstream-to= | * Set the base reference of the branch (for rebase): <code>git branch --set-upstream-to=<remote><branch_name></code> | ||
==Git use case example== | ==Git use case example== | ||
| Line 41: | Line 41: | ||
===Branch management=== | ===Branch management=== | ||
Let's say you want to rebase your current branch topic-v1 to topic-v2 with new addition. Note topic-v1 could also be master too. | Let's say you want to rebase your current branch topic-v1 to topic-v2 with new addition. Note topic-v1 could also be master too. | ||
* Go to current branch: git checkout topic-v1 | * Go to current branch: <code>git checkout topic-v1</code> | ||
* Create a new one: git branch topic-v2 | * Create a new one: <code>git branch topic-v2</code> | ||
* Go into the new branch: git checkout topic-v2 | * Go into the new branch: <code>git checkout topic-v2</code> | ||
* Set the reference: git branch --set-upstream-to=origin/master topic-v2 | * Set the reference: <code>git branch --set-upstream-to=origin/master topic-v2</code> | ||
* Rebase: git rebase -i | * Rebase: <code>git rebase -i</code> | ||
* ... | * ... | ||
===Split commit=== | ===Split commit=== | ||
* copy your repository if you're not confident with this kind of operation: cp -a | * copy your repository if you're not confident with this kind of operation: <code>cp -a <repository><repository backup></code> | ||
* do a rebase: git rebase -i | * do a rebase: <code>git rebase -i</code> | ||
* Use edit on the commit that you want to split | * Use edit on the commit that you want to split | ||
... rebase on-going... | ... rebase on-going... | ||
* Uncommit: git reset --soft HEAD~1 | * Uncommit: <code>git reset --soft HEAD~1</code> | ||
* Unstage: git reset HEAD -- | * Unstage: <code>git reset HEAD --</code> | ||
At this stage of operation, you | '''At this stage of operation, you have all your changes in the local file but nothing is ready to be committed.''' | ||
Repeat the 2 next commands for each new commit that you want to create | |||
* staged your change with dynamic selection: git add/rm -p | * staged your change with dynamic selection: <code>git add/rm -p <file></code> | ||
* commit your change: git commit | * commit your change: <code>git commit</code> | ||
Once you have finished to split your commit: | Once you have finished to split your commit: | ||
* finish the rebase: git rebase --continue | * finish the rebase: <code>git rebase --continue</code> | ||
{{PCSX2 Documentation Navbox}} | |||