X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=6272b08f8042abdc30a7b49171fa6e100286a869;hb=a958d8c8fcf792a478eecd22aacb09ee6f0b380e;hp=a576f3ba4738858e92f95848c42643e715c0acec;hpb=49ebc739103b8690743278b8f2369f5f7edd2d5d;p=git-wiki.git diff --git a/pep-git.txt b/pep-git.txt index a576f3b..6272b08 100644 --- a/pep-git.txt +++ b/pep-git.txt @@ -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 @@ -118,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 @@ -219,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 @@ -380,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? @@ -408,6 +413,7 @@ and configure rebase for existing branches:: 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 @@ -416,25 +422,25 @@ After that ``git pull origin v2`` becomes equivalent to ``git pull 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-