X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=pep-git.txt;h=6a9f20b2371c9cb813d6268f946c2d9011012fda;hb=a6d17ba08116f8da6ab854e3913c2ab10c9a7aea;hp=8aa472cd7a3ac23a6549ffdf2eb6eae732147191;hpb=6ac5e8abf4fcf720b730dc946353bd9727bc2a14;p=git-wiki.git
diff --git a/pep-git.txt b/pep-git.txt
index 8aa472c..6a9f20b 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -85,16 +85,13 @@ 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.
-
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 +223,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
@@ -297,7 +308,7 @@ during fetch/pull. To fetch all tags (and commits they point to) run
``git fetch --tags origin``. To fetch some specific tags fetch them
explicitly::
- $ git fetch origin tag NAME1 tag NAME2...
+ $ git fetch origin tag TAG1 tag TAG2...
For example::
@@ -310,6 +321,8 @@ pushed). To push tags list them explicitly::
$ git push origin tag 1.4.2
$ git push origin v1 v2 tag 2.1.7
+Don't move tags with ``git tag -f`` after they have been published.
+
Commit editing and caveats
==========================
@@ -363,20 +376,6 @@ How to undo a merge
https://kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.html
-Advanced topics
-===============
-
-Staging area
-------------
-
-Staging area aka index is a distinguishing feature of git. See
-`WhatIsTheIndex
-`_ and
-`IndexCommandQuickref
-`_ in Git
-Wiki.
-
-
Merge or rebase?
================
@@ -396,6 +395,20 @@ ReReRe
https://git-scm.com/book/en/Git-Tools-Rerere
+Advanced topics
+===============
+
+Staging area
+------------
+
+Staging area aka index is a distinguishing feature of git. See
+`WhatIsTheIndex
+`_ and
+`IndexCommandQuickref
+`_ in Git
+Wiki.
+
+
Advanced configuration
======================
@@ -416,9 +429,17 @@ TODO: dangling objects, git gc, git repack.
Tips and tricks
===============
+TODO: sticky options; example: git grep -O.
+
TODO: bash/zsh completion, bash/zsh prompt.
+git on server
+=============
+
+TODO: anonymous access; git over ssh; gitolite; gitweb; cgit; gitlab.
+
+
From Mercurial to git
=====================