X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=d13193422d307f9068e66001c1d433e75995b6b0;hb=b6a0118c91b2b25286fb32dca9f546012feb3ce6;hp=6a298b9f7ee3257d889ea09c81e7d0411e34d271;hpb=910f0000abefa817cad6f7770e56a96c4bcdefd5;p=git-wiki.git
diff --git a/pep-git.txt b/pep-git.txt
index 6a298b9..d131934 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -85,9 +85,8 @@ MacOS X: use git installed with `XCode
`_ or
install git with `Homebrew `_: ``brew install git``.
-`git-cola `_ is a sleek and
-powerful Git GUI written in Python and GPL licensed. Linux, Windows,
-MacOS X.
+`git-cola `_ is a 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.
@@ -118,10 +117,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
@@ -145,8 +149,8 @@ Labels, on the other hand, can be created, moved, renamed and deleted
freely.
-Remote repository and remote branches
-=====================================
+Remote repositories and remote branches
+=======================================
Another example of slightly misleading terminology. Remote
repositories are really remote, you access them via network (well, a
@@ -169,9 +173,10 @@ To see local and remote branches (and tags) pointing to commits::
You never do your own development on remote branches. You create a
local branch that has a remote branch as upstream and do development
-on that local branch. On push git updates remote branches, and on pull
-git updates remote branches and fast-forwards, merges or rebases local
-branches.
+on that local branch. On push git pushes commits to the remote repo
+and updates remote branches, on pull git fetches commits from the
+remote repo, updates remote branches and fast-forwards, merges or
+rebases local branches.
When you do an initial clone like this::
@@ -376,11 +381,24 @@ or shared repository.
Undo
====
-TODO: describe undo strategies: git reset, git revert, git checkout,
-git reflog. "Commit early, commit often".
+Whatever you do, don't panic. Almost anything in git can be undone.
+``git checkout``, for example, can be used to restore the content of
+file(s) to that one of a commit. Like this::
+
+ git checkout HEAD~ README
+
+The commands restores the contente of README file to the last but one
+commit in the current branch. By default a commit ID is simple HEAD;
+i.e. ``git checkout README`` restores README to the latest commit.
+
+(Do not use ``git checkout`` to view a content of a file in a commit,
+use ``git cat-file -p``; e.g. ``git cat-file -p HEAD~:path/to/README``).
+
+TODO: describe undo strategies: git reset, git reflog, git revert.
+"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 +426,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,12 +435,12 @@ 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 a new issue branch and switch to it
...edit/test/commit...
$ git checkout v2
$ git pull --rebase origin v2 # update v2 from the upstream
@@ -432,9 +451,9 @@ workflow would be something like::
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--M--< v2 - it is the mainline branch
+ o--o--o--o--o--M--< v2 - the mainline branch
\ /
- --*--*--* - it is the topic branch, now unnamed
+ --*--*--* - 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
@@ -444,7 +463,7 @@ feature was implemented should be in the commit messages.
Null-merges
===========
-Git has a builtin strategy for what Python core developers call
+Git has a builtin merge strategy for what Python core developers call
"null-merge"::
$ git merge -s ours v1 # null-merge v1 into v2
@@ -485,6 +504,7 @@ Database maintenance
====================
TODO: dangling objects, git gc, git repack.
+https://gcc.gnu.org/ml/gcc/2007-12/msg00165.html
Tips and tricks
@@ -492,7 +512,10 @@ Tips and tricks
TODO: sticky options; example: git grep -O.
+TODO: tricky options; example: git log -p3.
+
TODO: bash/zsh completion, bash/zsh prompt.
+https://git.kernel.org/cgit/git/git.git/tree/contrib/completion
git on server
@@ -500,6 +523,11 @@ git on server
TODO: anonymous access; git over ssh; gitolite; gitweb; cgit; gitlab.
+http://gitolite.com/gitolite/index.html
+
+https://git.kernel.org/cgit/git/git.git/tree/gitweb
+
+http://git.zx2c4.com/cgit/
From Mercurial to git
=====================