`Git workflows
<https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html>`_.
+Advanced documentation
+----------------------
+
`Git Magic
<http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html>`_,
also with a number of translations.
-Advanced documentation
-----------------------
-
`Pro Git <https://git-scm.com/book>`_. The Book about git. Buy it at
Amazon or download in PDF, mobi, or ePub form. Has translations to
many different languages. Download Russian translation from `GArik
::
$ git fetch REMOTE BRANCH
- $ git merge FETCH_HEAD # FETCH_HEAD is a literal here
+ $ git merge FETCH_HEAD # FETCH_HEAD is a literal here
Certainly, BRANCH in that case should be your current branch. If you
want to merge a different branch into your current branch first update
that non-current branch and then merge::
- $ git fetch origin v1:v1 # Update v1
- $ git pull --rebase origin v2 # Update the current branch v2 using
- # rebase instead of merge
+ $ git fetch origin v1:v1 # Update v1
+ $ git pull --rebase origin v2 # Update the current branch v2 using
+ # rebase instead of merge
$ git merge v1
If you have not yet pushed commits on ``v1``, though, the scenario has
git reflog. "Commit early, commit often".
How to undo a merge
-https://kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html
+https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html
Merge or rebase?
back to the topic branch to continue working on it. The entire
workflow would be something like::
- $ git checkout -b issue-42 # create and switch to a new branch
+ $ git checkout -b issue-42 # create and switch to a new branch
...edit/test/commit...
$ git checkout v2
- $ git pull --rebase origin v2 # update v2 from the upstream
+ $ git pull --rebase origin v2 # update v2 from the upstream
$ git merge issue-42
- $ git branch -d issue-42 # delete the topic branch
+ $ git branch -d issue-42 # delete the topic branch
$ git push origin v2
When the topic branch is deleted only the label is removed, commits
are stayed in the database, they are now merged into v2::
- --o--o--o--o--o--o-M-<v2 - it is the mainline branch
- \ /
- --*--*--* - it is the topic branch, now unnamed
+ o--o--o--o--o--M--< v2 - it is the mainline branch
+ \ /
+ --*--*--* - it is the topic branch, now unnamed
The topic branch is deleted to avoid cluttering branch namespace with
small topic branches. Information on what issue was fixed or what
Git has a builtin strategy for what Python core developers call
"null-merge"::
- $ git merge -s ours v1 # null-merge v1 into v2
+ $ git merge -s ours v1 # null-merge v1 into v2
ReReRe