diff --git a/git-obzornik.pdf b/git-obzornik.pdf index 0df450c..2dcd73c 100644 Binary files a/git-obzornik.pdf and b/git-obzornik.pdf differ diff --git a/git-obzornik.tex b/git-obzornik.tex index 6777113..7ef8dec 100644 --- a/git-obzornik.tex +++ b/git-obzornik.tex @@ -1,7 +1,7 @@ \documentclass[a4paper]{article} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} -\usepackage[slovene]{babel} +\usepackage[english,slovene]{babel} \usepackage{amsmath} \usepackage{amssymb} \usepackage{graphicx} @@ -22,7 +22,7 @@ \newtheorem{opomba}{Opomba} \newcommand{\gitobject}[2]{\texttt{.git/objects/#1/#2}} \title{Matematični pogled na Git} -\author{Martin Vuk} +\author{Martin Vuk \\ \small Fakulteta za računalništvo in informatiko \\ \small Univerza v Ljubljani} \date{\today} \begin{document} @@ -36,11 +36,31 @@ ureja iste datoteke. Ogledali si bomo, kako Git deluje. Opisali bomo, kako Git uporabi \emph{zgoščevalne funkcije}, \emph{Merklejeva drevesa} in \emph{usmerjene aciklične grafe}, da shrani zgodovino različic in - olajša hkratno urejanje vsebine. Matematični model, ki ga Git uporablja + olajša hkratno urejanje vsebine. Matematični model, ki ga Git uporablja, je v resnici zelo preprost in njegovo razumevanje nas lahko reši marsikatere zagate, ki nastane med njegovo uporabo. \end{abstract} +\begin{otherlanguage}{english} +\begin{abstract} + Git is a version control system that allows tracking changes in files within a directory. + It is mainly used for source code management in software development. However, many of us + also use it for writing texts in \LaTeX. Besides tracking history, Git facilitates + merging changes when multiple people edit the same files simultaneously. We will look at + how Git works. We will describe how Git uses \emph{hash functions}, \emph{Merkle trees}, + and \emph{directed acyclic graphs} to store version history and facilitate concurrent + content editing. The mathematical model used by Git is actually very simple, and + understanding it can save us many headaches during its use. +\end{abstract} +\end{otherlanguage} + +\textbf{Ključne besede:} Git, sistem za nadzor različic, zgoščevalna funkcija, usmerjen aciklični graf, rojstnodnevni problem. + +\textbf{Keywords:} Git, Version Control System, Hash Function, Directed Acyclic Graph, Birthday Problem. + +\medskip +\noindent \textbf{Math. Subj. Class. (2020)} 68P05, 68P20, 05C20, 60C05. + \section{Kaj je Git?} \href{https://git-scm.com/}{Git} je kot \emph{časovni stroj} za