X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=pep-git.txt;h=2b55d6341cc55f7a9ceb87e9010ef0d680d97c18;hb=5951ed5068761231f74d262aaa9a8a290a3fae99;hp=0dbd13cffbfd6a506eec947da62abaa9f16ede40;hpb=e06bd95a662dfe7f5c9fa8cb905ff8d263c9e24a;p=git-wiki.git
diff --git a/pep-git.txt b/pep-git.txt
index 0dbd13c..2b55d63 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -85,16 +85,20 @@ MacOS X: use git installed with `XCode
`_ or
install git with `Homebrew `_: ``brew install git``.
-`Atlassins's SourceTree `_ is a free
-Git and Mercurial GUI client for Windows or Mac.
+`git-cola `_ is a sleek and
+powerful Git GUI written in Python and GPL licensed. Linux, Windows,
+MacOS X.
+
+`TortoiseGit `_ is a Windows Shell Interface
+to Git based on TortoiseSVN; open source.
Initial configuration
---------------------
This simple code is often appears in documentation, but it is
-important so let repeat it here. Git marks every commit with author
-and committer names/emails, so configure your real name and preferred
-email::
+important so let repeat it here. Git stores author and committer
+names/emails in every commit, so configure your real name and
+preferred email::
$ git config --global user.name "User Name"
$ git config --global user.email user.name@example.org
@@ -226,6 +230,20 @@ that non-current branch and then merge::
# rebase instead of merge
$ git merge v1
+If you have not yet pushed commits on ``v1``, though, the scenario has
+to become a bit more complex. Git refuses to update
+non-fast-forwardable branch, and you don't want to do force-pull
+because that would remove your non-pushed commits and you would need
+to recover. So you want to rebase ``v1`` but you cannot rebase
+non-current branch. Hence, checkout ``v1`` and rebase it before
+merging::
+
+ $ git checkout v1
+ $ git pull --rebase origin v1
+ $ git checkout v2
+ $ git pull --rebase origin v2
+ $ git merge v1
+
It is possible to configure git to make it fetch/pull a few branches
or all branches at once, so you can simply run
@@ -368,6 +386,56 @@ https://kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html
Merge or rebase?
================
+Internet is full of heated discussions on the topic: "merge or
+rebase?" Most of them are meaningless. When a DVCS is being used in a
+big team with a big and complex project with many branches there is
+simply no way to avoid merges. So the question diminished to "whether
+to use rebase, and if yes - when to use rebase?" Considering that it
+is very much recommended not to rebase published commits the question
+diminished even further: "whether to use rebase on non-pushed
+commits?"
+
+That small question is for the team to decide. The author of the PEP
+recommends to use rebase when pulling, i.e. always do ``git pull
+--rebase`` or even configure automatic setup of rebase for every new
+branch::
+
+ $ git config branch.autosetuprebase true
+
+and configure rebase for existing branches::
+
+ $ git config branch.NAME.rebase true
+
+After that ``git pull origin v2`` will be equivalent to ``git pull
+--rebase origin v2``.
+
+In case when merge is preferred it is recommended to create new
+commits in a separate feature or topic branch while using rebase to
+update the mainline branch. When the topic branch is ready merge it
+into mainline. To avoid a tedious task of resolving conflicts you can
+merge the topic branch to the mainline from time to time and switch
+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
+ ...edit/test/commit...
+ $ git checkout v2
+ $ git pull --rebase origin v2 # update v2 from the upstream
+ $ git merge issue-42
+ $ 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-