X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=c2bb7dd07271fe886f2a8978076fd05de7d2c887;hb=93ea7a95b31831f5b416fbcd7b7999f9d9fc78a7;hp=a9b4d9ea3b37911fbdc6431541bc7a419946637c;hpb=3464b8a43624f0a795e7a0b2908304cd4a661a70;p=git-wiki.git diff --git a/pep-git.txt b/pep-git.txt index a9b4d9e..c2bb7dd 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -3,7 +3,7 @@ Title: Collecting information about git Version: $Revision$ Last-Modified: $Date$ Author: Oleg Broytman -Status: Active +Status: Draft Type: Informational Content-Type: text/x-rst Created: 01-Jun-2015 @@ -45,13 +45,13 @@ Git Tutorial: `part 1 `Git workflows `_. +Advanced documentation +---------------------- + `Git Magic `_, also with a number of translations. -Advanced documentation ----------------------- - `Pro Git `_. 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 @@ -89,6 +89,9 @@ install git with `Homebrew `_: ``brew install git``. 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 --------------------- @@ -115,10 +118,15 @@ done something like that:: $ cd python $ git branch v1 origin/v1 +The first command clones remote repository into local directory +`python``, creates a new local branch v2, sets remotes/origin/v2 as +its upstream remote branch and checks it out into the working +directory. + The last command creates a new local branch v1 and sets remotes/origin/v1 as its upstream remote branch. -The same result can achieved with commands:: +The same result can be achieved with commands:: $ git clone -b v1 http://git.python.org/python.git $ cd python @@ -216,15 +224,15 @@ is equivalent to :: $ 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 @@ -377,7 +385,7 @@ TODO: describe undo strategies: git reset, git revert, git checkout, 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? @@ -386,11 +394,11 @@ 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?" +simply no way to avoid merges. So the question's 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's 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 @@ -403,31 +411,36 @@ and configure rebase for existing branches:: $ git config branch.NAME.rebase true -After that ``git pull origin v2`` will be equivalent to ``git pull +For example:: + + $ git config branch.v1.rebase true + $ git config branch.v2.rebase true + +After that ``git pull origin v2`` becomes 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:: +into mainline. To avoid a tedious task of resolving large number of +conflicts at once 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 + $ 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-