gitkgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) this prompts you for soft,...

11
27.02.2012 GITK Jonas Cordes

Upload: others

Post on 05-Oct-2020

5 views

Category:

Documents


0 download

TRANSCRIPT

Page 1: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012

GITK

Jonas Cordes

Page 2: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Main Objectives

Visualization & control

Traceability of changes

Knowing the commands – helps learn to use command-line tools more easy

Page 3: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Open gitk

•  --all •  gitk --all to see all branches

•  --since=<date> & --until=<date> •  gitk --since=“2 days go”

Page 4: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Legend (History View) HEAD commit

commit

branchtrack

local branch remote branch

tag

commit message

committers name commit date

Page 5: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

File menu

•  Reload •  Refreshes everything as if you started the

program again with the same configuration •  UI-Visualization (colors, structure) can

change •  Update

•  Refreshes all information •  UI-Visualization (colors, structure) stay the

same •  Reread References •  List References

•  Quick search function •  Start git gui

Page 6: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

View

Page 7: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Content Menu (History Window)

Page 8: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Content Menu (History Window)

•  git-diff (Diff this <-> selected •  git-format-patch (make patch) •  git-tag (create tag to mark important places in the History) •  git-diff-tree (write commit to file, rarely used) •  git-branch •  git-cherry-pick •  git-reset (reset branch to here) This prompts you for soft,

mixed, or hard, with a brief reminder of what each does.

• Mark a commit • Return to mark •  Find descendant (mark and current) • Compare (mark with current)

Page 9: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Commit Menu

Hash of commit

gitk interaction history

Search commit

Page 10: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Diff Window

Search diff output

Diff output

Edit diff output visualisation

Files

Page 11: GITKgitk.pdf · 2014. 10. 21. · • git-reset (reset branch to here) This prompts you for soft, mixed, or hard, with a brief reminder of what each does. ... BugSquashingSeminar_Doxygen.pptx

27.02.2012 |

Jonas Cordes MBI

Ende Vielen Dank!