git Tutorial Nicola Chiapolini Physik-Institut University of Zurich March 16, 2015

Transcription

1 Nicola Chiapolini, March 16, / 31 git Tutorial Nicola Chiapolini Physik-Institut University of Zurich March 16, 2015 Based on talk by Emanuele Olivetti This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 License.

2 Nicola Chiapolini, March 16, / 31 Outline Introduction Commands Local Remote Behind the Scenes

3 Nicola Chiapolini, March 16, / 31 Outline Introduction Commands Local Remote Behind the Scenes

4 Nicola Chiapolini, March 16, / 31 Uses for git Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later. Git Website checkpoints/backups/releases document developer effort collaboration across the globe for anything that s text code thesis/papers system config files (vcsh)...and everything else ( "gitify your life", git-annex )

5 Nicola Chiapolini, March 16, / 31 Version Control: Local Computer Checkout file Version Database Version 3 Version 2 Version 1 checkout working directory version database repository

6 Nicola Chiapolini, March 16, / 31 Version Control: Central Computer A Checkout file Server Version Database Version 3 Computer B Checkout file Version 2 Version 1

7 Nicola Chiapolini, March 16, / 31 Version Control: Distributed Computer A Checkout Version Database file Version 3 Version 2 Version 1 Computer B Checkout Version Database file Version 3 Server Version Database Version 3 Version 2 Version 1 Version 2 Version 1

8 Nicola Chiapolini, March 16, / 31 git: Help usage: git [OPTIONS] COMMAND [ARGS] The most commonly used git commands are: add Add file contents to the index commit Record changes to the repository diff Show changes between commits, commit and working tree, etc... git help <command> git help <concept> git status

9 Nicola Chiapolini, March 16, / 31 git: Introduce yourself git config --global user.name "Nicola Chiapolini" git config --global user. "nchiapol@physik.uzh.ch"

10 Nicola Chiapolini, March 16, / 31 Outline Introduction Commands Local Remote Behind the Scenes

11 Nicola Chiapolini, March 16, / 31 Init git init Creates an empty git repository. Creates the git directory:.git/ working directory staging area does not change your files

12 Nicola Chiapolini, March 16, / 31 Add git add file1 [file2...] Adds new files to be tracked by git Adds changes from working dir for next commit DOES NOT add info on file permissions other than exec/noexec DOES NOT add directories per se. working directory staging area git add

13 Nicola Chiapolini, March 16, / 31 Commit git commit [-m "Commit message."] Records changes from the staging area to. working directory staging area git commit

14 Nicola Chiapolini, March 16, / 31 Direct Commit git commit file1 file2 [-m "Commit message."] Records all changes of file1, file2 from working dir and staging area to. working directory staging area git commit <filename> git commit -a[m "Commit message."] Records all changes in working dir and staging area. Be Careful!

15 Nicola Chiapolini, March 16, / 31 Diff git diff [filename...] Shows changes between working directory and staging area working directory staging area git diff

16 Nicola Chiapolini, March 16, / 31 Diff Staged How do I see what is staged? git diff --staged shows differences between staging area and last commit. working directory staging area git diff --staged

17 Nicola Chiapolini, March 16, / 31 Logs Shows details of the commits. git log [--oneline] working directory staging area git log

18 Nicola Chiapolini, March 16, / 31 Graphic Logs GUI to browse the git repository. gitk / gitg / qgit

19 Nicola Chiapolini, March 16, / 31 Changing Version git checkout <file commit> working directory staging area git checkout <file>

20 Nicola Chiapolini, March 16, / 31 Changing Version git checkout <file commit> working directory staging area git checkout <commit>

21 Nicola Chiapolini, March 16, / 31 (Re)move. git rm <filename> git mv <oldname> <newname> Remember to commit these changes! git commit -m "File (re)moved."

22 Nicola Chiapolini, March 16, / 31 Outline Introduction Commands Local Remote Behind the Scenes

23 Nicola Chiapolini, March 16, / 31 General Remarks Computer A Checkout Version Database file Version 3 Version 2 Version 1 Server Version Database Version 3 Computer B Checkout Version Database file Version 3 Version 2 Version 1 Version 2 Version 1 Remote can be anywhere: central server on the internet other directory on your own harddrive different partners your collaborating with (you can have more then one remote)

24 Nicola Chiapolini, March 16, / 31 Clone git clone <URL> Creates two local copies of the whole remote repository. Remote (Server) Version Database Hint git remote -v shows name and URL of the remote repository.

25 Nicola Chiapolini, March 16, / 31 Clone git clone <URL> Creates two local copies of the whole remote repository. Local (Computer A) Remote (Server) working directory staging area remote/ origin/ git clone <url> Checkout Version Database Version Database Hint git remote -v shows name and URL of the remote repository.

26 Nicola Chiapolini, March 16, / 31 Commands Local Remote working directory staging area remote/ origin/ git add git commit git push git fetch git checkout git merge

27 Nicola Chiapolini, March 16, / 31 Fetch git fetch Updates origin from remote local, staging area and working dir not changed Local Remote working directory staging area remote/ origin/ git fetch

28 Nicola Chiapolini, March 16, / 31 Merge git merge combines changes from both sources Warning: can generate conflicts! Local Remote working directory staging area remote/ origin/ git merge git fetch + git merge = git pull

29 Nicola Chiapolini, March 16, / 31 Conflicts Conflict!... <<<<<<< yours:sample.txt Conflict resolution is hard; let's go shopping. ======= Git makes conflict resolution easy. >>>>>>> theirs:sample.txt...

30 Nicola Chiapolini, March 16, / 31 Resolving Conflicts 1. See where conflicts are: 2. Edit conflicting lines. git diff 3. Add changes to the staging area: 4. Commit changes: git add file1 [...] git commit -m "Conflicts solved."

31 Nicola Chiapolini, March 16, / 31 Push git push Updates remote. Requires fetch+merge first. Local Remote working directory staging area remote/ origin/ git push

32 Nicola Chiapolini, March 16, / 31 Outline Introduction Commands Local Remote Behind the Scenes

33 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Setup git init; git add [...]; git commit -m "A: init" a working dir staging area

34 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Setup git init; git add [...]; git commit -m "A: init" a HEAD working dir staging area

35 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Setup git commit -am "B" a b HEAD working dir staging area

36 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Setup git commit -am "C" a b c HEAD working dir staging area

37 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Branches git branch devel devel a b c HEAD working dir staging area devel

38 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Branches git checkout devel devel HEAD a b c working dir staging area devel

39 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Branches git commit -am "D" devel HEAD a b c d working dir staging area devel

40 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Branches git commit -am "E" devel HEAD d e a b c working dir staging area devel

41 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Branches git checkout devel d e a b c HEAD working dir staging area devel

42 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Branches git commit -am "F" devel a b c d e f HEAD working dir staging area devel

43 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Branches git merge devel devel a b c d e f g HEAD working dir staging area devel

44 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Setup git commit -am "C" a b c HEAD working dir staging area

45 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Tags git tag v1.0 a b c v1.0 HEAD working dir staging area

46 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Tags git commit -am "H" a b c v1.0 h HEAD working dir staging area

47 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Detached HEAD git checkout b HEAD a b c v1.0 h working dir staging area

48 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Detached HEAD git commit -am "J" HEAD j a b c v1.0 h working dir staging area

49 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Detached HEAD git commit -am "K" HEAD j k a b c v1.0 h working dir staging area

50 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Detached HEAD git checkout j k a b c v1.0 h HEAD working dir staging area

51 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Detached HEAD git commit -am "K" HEAD j k a b c v1.0 h working dir staging area

52 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Detached HEAD git checkout -b devel devel HEAD j k a b c v1.0 h working dir staging area devel

53 Nicola Chiapolini, March 16, / 31 Behind the Scenes: Detached HEAD git checkout devel j k a b c v1.0 h HEAD working dir staging area devel

54 Nicola Chiapolini, March 16, / 31 Questions? Understanding how git works: git foundations, by Matthew Brett: The git parable, by Tom Preston-Werner: http: //tom.preston-werner.com/2009/05/19/the-git-parable.html Excellent guides: Pro Git book: (FREE) git magic:

55 Nicola Chiapolini, March 16, / 1 Behind the Scenes: Rebase git checkout devel devel HEAD a b c d e f working dir staging area devel

56 Nicola Chiapolini, March 16, / 1 Behind the Scenes: Rebase git rebase devel HEAD a b c f d e working dir staging area devel