-
1. Pričetek
- 1.1 O nadzoru različic
- 1.2 Kratka zgodovina Git-a
- 1.3 Osnove Git
- 1.4 The Command Line
- 1.5 Git namesitev
- 1.6 Prva namestitev Git-a
- 1.7 Pridobitev pomoči
- 1.8 Povzetek
-
2. Osnove Git
- 2.1 Pridobitev repozitorija Git
- 2.2 Snemanje sprememb repozitorija
- 2.3 Pregled zgodovine pošiljanja
- 2.4 Razveljavljanje stvari
- 2.5 Delo z daljavami
- 2.6 Označevanje
- 2.7 Git aliasi
- 2.8 Povzetek
-
3. Veje Git
- 3.1 Veje na kratko
- 3.2 Osnove vej in združevanja
- 3.3 Upravljanje vej
- 3.4 Potek dela z vejami
- 3.5 Oddaljene veje
- 3.6 Ponovno baziranje (rebasing)
- 3.7 Povzetek
-
4. Git na strežniku
- 4.1 Protokoli
- 4.2 Pridobiti Git na strežnik
- 4.3 Generiranje vaših javnih ključev SSH
- 4.4 Nastavitev strežnika
- 4.5 Prikriti proces Git
- 4.6 Pametni HTTP
- 4.7 GitWeb
- 4.8 GitLab
- 4.9 Tretje osebne opcije gostovanja
- 4.10 Povzetek
-
5. Distribuirani Git
- 5.1 Distribuirani poteki dela
- 5.2 Prispevanje projektu
- 5.3 Vzdrževanje projekta
- 5.4 Povzetek
-
6. GitHub
-
7. Orodja Git
- 7.1 Revision Selection
- 7.2 Interactive Staging
- 7.3 Stashing and Cleaning
- 7.4 Signing Your Work
- 7.5 Searching
- 7.6 Rewriting History
- 7.7 Reset Demystified
- 7.8 Advanced Merging
- 7.9 Rerere
- 7.10 Debugging with Git
- 7.11 Submodules
- 7.12 Bundling
- 7.13 Replace
- 7.14 Credential Storage
- 7.15 Povzetek
-
8. Prilagoditev Git-a
- 8.1 Git Configuration
- 8.2 Git Attributes
- 8.3 Git kljuke
- 8.4 An Example Git-Enforced Policy
- 8.5 Povzetek
-
9. Git in drugi sistemi
- 9.1 Git kot klient
- 9.2 Migracija na Git
- 9.3 Povzetek
-
10. Notranjost Git-a
- 10.1 Napeljava in porcelan
- 10.2 Git Objects
- 10.3 Git References
- 10.4 Packfiles
- 10.5 The Refspec
- 10.6 Transfer Protocols
- 10.7 Maintenance and Data Recovery
- 10.8 Environment Variables
- 10.9 Povzetek
-
A1. Appendix A: Git v drugih okoljih
- A1.1 Grafični vmesniki
- A1.2 Git v Visual Studiu
- A1.3 Git v Eclipse
- A1.4 Git V Bash-u
- A1.5 Git v Zsh
- A1.6 Git v Powershell-u
- A1.7 Povzetek
-
A2. Appendix B: Vključevanje Git-a v vašo aplikacijo
- A2.1 Git v ukazni vrstici
- A2.2 Libgit2
- A2.3 JGit
-
A3. Appendix C: Git Commands
- A3.1 Setup and Config
- A3.2 Getting and Creating Projects
- A3.3 Basic Snapshotting
- A3.4 Branching and Merging
- A3.5 Sharing and Updating Projects
- A3.6 Inspection and Comparison
- A3.7 Debugging
- A3.8 Patching
- A3.9 Email
- A3.10 External Systems
- A3.11 Administration
- A3.12 Plumbing Commands
A3.4 Appendix C: Git Commands - Branching and Merging
Branching and Merging
There are just a handful of commands that implement most of the branching and merging functionality in Git.
git branch
The git branch
command is actually something of a branch management tool.
It can list the branches you have, create a new branch, delete branches and rename branches.
Most of [ch03-git-branching] is dedicated to the branch
command and it’s used throughout the entire chapter.
We first introduce it in Ustvarjanje nove veje and we go through most of its other features (listing and deleting) in Upravljanje vej.
In Sledenje vej we use the git branch -u
option to set up a tracking branch.
Finally, we go through some of what it does in the background in Git References.
git checkout
The git checkout
command is used to switch branches and check content out into your working directory.
We first encounter the command in Switching Branches along with the git branch
command.
We see how to use it to start tracking branches with the --track
flag in Sledenje vej.
We use it to reintroduce file conflicts with --conflict=diff3
in Checking Out Conflicts.
We go into closer detail on its relationship with git reset
in Reset Demystified.
Finally, we go into some implementation detail in The HEAD.
git merge
The git merge
tool is used to merge one or more branches into the branch you have checked out.
It will then advance the current branch to the result of the merge.
The git merge
command was first introduced in Osnove vej.
Though it is used in various places in the book, there are very few variations of the merge
command — generally just git merge <branch>
with the name of the single branch you want to merge in.
We covered how to do a squashed merge (where Git merges the work but pretends like it’s just a new commit without recording the history of the branch you’re merging in) at the very end of Forkan javni projekt.
We went over a lot about the merge process and command, including the -Xignore-space-change
command and the --abort
flag to abort a problem merge in Advanced Merging.
We learned how to verify signatures before merging if your project is using GPG signing in Signing Commits.
Finally, we learned about Subtree merging in Združevanje pod dreves.
git mergetool
The git mergetool
command simply launches an external merge helper in case you have issues with a merge in Git.
We mention it quickly in Basic Merge Conflicts and go into detail on how to implement your own external merge tool in External Merge and Diff Tools.
git log
The git log
command is used to show the reachable recorded history of a project from the most recent commit snapshot backwards.
By default it will only show the history of the branch you’re currently on, but can be given different or even multiple heads or branches from which to traverse.
It is also often used to show differences between two or more branches at the commit level.
This command is used in nearly every chapter of the book to demonstrate the history of a project.
We introduce the command and cover it in some depth in Pregled zgodovine pošiljanja.
There we look at the -p
and --stat
option to get an idea of what was introduced in each commit and the --pretty
and --oneline
options to view the history more concisely, along with some simple date and author filtering options.
In Ustvarjanje nove veje we use it with the --decorate
option to easily visualize where our branch pointers are located and we also use the --graph
option to see what divergent histories look like.
In Privatna majhna ekipa and Commit Ranges we cover the branchA..branchB
syntax to use the git log
command to see what commits are unique to a branch relative to another branch.
In Commit Ranges we go through this fairly extensively.
In Merge Log and Triple Dot we cover using the branchA...branchB
format and the --left-right
syntax to see what is in one branch or the other but not in both.
In Merge Log we also look at how to use the --merge
option to help with merge conflict debugging as well as using the --cc
option to look at merge commit conflicts in your history.
In RefLog Shortnames we use the -g
option to view the Git reflog through this tool instead of doing branch traversal.
In Searching we look at using the -S
and -L
options to do fairly sophisticated searches for something that happened historically in the code such as seeing the history of a function.
In Signing Commits we see how to use --show-signature
to add a validation string to each commit in the git log
output based on if it was validly signed or not.
git stash
The git stash
command is used to temporarily store uncommitted work in order to clean out your working directory without having to commit unfinished work on a branch.
This is basically entirely covered in Stashing and Cleaning.
git tag
The git tag
command is used to give a permanent bookmark to a specific point in the code history.
Generally this is used for things like releases.
This command is introduced and covered in detail in Označevanje and we use it in practice in Tagging Your Releases.
We also cover how to create a GPG signed tag with the -s
flag and verify one with the -v
flag in Signing Your Work.