Git for System Admins.Key

Total Page:16

File Type:pdf, Size:1020Kb

Git for System Admins.Key GIT FOR SYSTEM ADMINS JUSTIN ELLIOTT PENN STATE UNIVERSITY VERSION CONTROL WHAT IS IT? • Manages changes and versions of files • Also known as: • Source Code Management (SCM) • Version Control System (VCS) WHY USE IT? • Reduces risk • Agility • Freedom to experiment • Collaboration • Helps document changes GIT INTRODUCTION WHY GIT? • Extremely fast performance • Excellent data integrity • Git checksums everything (SHA-1) • Easy to learn and to start small GIT OVERVIEW • Distributed • All clients have the full repo • Backups are everywhere • Local repo updated before remotes • When available, push updates to remote GIT VERSUS SUBVERSION • Much faster checkouts • Clients have full project • Distributed versus centralized • Network access optional* • Much simpler ignores • Seamless renames and moves • Easier branching and merging GIT FUNDAMENTALS GIT TERMINOLOGY • Working Directory • Repository REPO FILE CLASSIFICATIONS • Tracked • Ignored • Untracked TRACKED FILE STATES • Modified • Staged • Committed GIT WORKFLOW STAGES Working Directory Add Staging Area Commit Repository GIT INSTALLATION & CONFIGURATION HOW TO INSTALL GIT • Embedded with many Git GUI Apps • Download from http://git-scm.com • OS X: Terminal.app • Windows: Git Bash • Linux: Terminal • OS X: MacPorts and HomeBrew CONFIGURING GIT • Git GUI clients handle it for you, or … • $ git config • Contains items such as name, email, editor, diff tool USING GIT CREATE A REPO • Create new empty project repository Working Directory ADD FILES TO THE REPO • Add (stage) files for the next commit Working Directory Add Staging Area COMMIT FILES TO REPO • Save staged files to the project repository Working Directory Add Staging Area Commit Repository COMMIT MESSAGES • Commit often - You will thank yourself later! • Or else … Larger changes are much harder to pick apart and revert back to! • Each commit should encapsulate a single fix* IGNORING FILES • Why • How • Scope • Repo only • All Repos ( Global ) REVIEWING DIFFS • Very easy to view with GitHub client and web • External diff apps • FileMerge • Kaleidoscope HISTORY LOGS • Review history of commits to repo • Extremely helpful for your future self and others GIT CLIENT APPS • http://git-scm.com/downloads/guis • GitHub • https://mac.github.com • https://windows.github.com • SourceTree • https://www.sourcetreeapp.com GITHUB • Simplifies the complex Git tasks • Integrates well with GitHub remote web service • Easy to start with • Limited feature set (by design) GITHUB AND STAGING FILES • Be aware … • The GitHub app does not show staged items. • So, why doesn’t it? • And why are you tell us this, Justin?! BRING IT ALL TOGETHER • Create repo • View file diff, commit • Commit file • Ignore files, commit • Modify the file • Review history logs GIT REMOTES REMOTE REPOS • Local repo on your client only • Remote is a Git host to push to • You clone from remotes • First remote is called “origin” REMOTE REPOS • Network Based • SSH • HTTPS • Git Protocol (daemon) SELF-HOSTED REPOS • SSH • Enable SSH, create “bare” repository on server • Atlassian Stash • Enterprise GitHub • GitLab REMOTE REPO HOST SERVICES • 3rd Party • GitHub, BitBucket • CodeSpaces, SourceRepo • Assembla, Gitorious • git.psu.edu (For Penn Staters) • And possibly more, I’m sure… GIT WORKFLOW STAGES Working Directory Add Staging Area Commit Repository Pull Push Remote CLONING • Copies repo from remote • Repo includes entire project PUSHING • Saves commits to remote server • Pushes active branch that you’re on FETCHING • Updates repo status of remote • Local repo files not changed • Tip: Fetch before pushing to remotes REMOTES DEMO • Create repo on GitHub (the remote) • Adds remote ref to local repo settings • Local branches track remote branches • Push full local repo to remote • Commit locally, push to origin remote • Create README.md file on GitHub, Pull BRANCHES BRANCHES • When to use them? • “master” is the default branch • Merging of branches is where Git really excels BRANCHES • Help to separate lines of development • “Git Flow” is a popular branching model • Ex: Master, Hotfix, Development, Feature, Release BRANCH WALK THROUGH First Commit M1 BRANCH WALK THROUGH M1 B1 New Branch BRANCH WALK THROUGH M1 B1 B2 Second Branch Commit BRANCH WALK THROUGH M1 B1 B2 B3 Third Branch Commit BRANCH WALK THROUGH M1 B1 B2 B3 B4 Fourth Branch Commit BRANCH WALK THROUGH Merge Branch To Master M1 M2 B1 B2 B3 B4 (Branch Deleted After Merge) HEAD REFERENCE • Checking out commit older than latest on branch • No code changes! Or … • Create a new branch FIRST LINE ENDINGS CONFIGURE LINE ENDINGS • End of line characters differ based on client OS • OS X and Linux use one invisible character • LF (Line Feed) • Windows uses two invisible characters • CR (Carriage Return) + LF (Line Feed) • Embrace the native line endings for each OS LINE ENDING MODES • core.autocrlf true • Use for cross platform projects on Windows clients • core.autocrlf input • Use for cross platform projects on OS X clients • core.autocrlf false • Use only on single platform projects LINE ENDINGS ON OS X Enable auto convert CRLF to LF: LINE ENDINGS ON WINDOWS Enable auto convert to LF on Windows by using git config to set core.autocrlf to true: SUMMARY LESSONS LEARNED • Start small • Pick just one project to manage with Git • Use remotes when ready • GitHub, BitBucket • Your own SSH host LESSONS LEARNED • Write good commit messages • There will be a time when you need to search your commit messages and it will really help you out! • Be nice to your future self. • “Where / when / how did I fix that issue?” • What’s for the release notes? RESOURCES AND TRAINING • Official Git Site • http://git-scm.com • Git Cheat Sheets • Git Pro Book RESOURCES AND TRAINING • http://try.github.com • http://atlassian.com/git • O’Reilly • “McCullough and Berglund on Mastering Git” Q & A Justin Elliott jelliott [at] psu.edu @justindelliott.
Recommended publications
  • Learn Python the Hard Way
    ptg11539604 LEARN PYTHON THE HARD WAY Third Edition ptg11539604 Zed Shaw’s Hard Way Series Visit informit.com/hardway for a complete list of available publications. ed Shaw’s Hard Way Series emphasizes instruction and making things as ptg11539604 Zthe best way to get started in many computer science topics. Each book in the series is designed around short, understandable exercises that take you through a course of instruction that creates working software. All exercises are thoroughly tested to verify they work with real students, thus increasing your chance of success. The accompanying video walks you through the code in each exercise. Zed adds a bit of humor and inside jokes to make you laugh while you’re learning. Make sure to connect with us! informit.com/socialconnect LEARN PYTHON THE HARD WAY A Very Simple Introduction to the Terrifyingly Beautiful World of Computers and Code Third Edition ptg11539604 Zed A. Shaw Upper Saddle River, NJ • Boston • Indianapolis • San Francisco New York • Toronto • Montreal • London • Munich • Paris • Madrid Capetown • Sydney • Tokyo • Singapore • Mexico City Many of the designations used by manufacturers and sellers to distinguish their products are claimed as trademarks. Where those designations appear in this book, and the publisher was aware of a trademark claim, the designations have been printed with initial capital letters or in all capitals. The author and publisher have taken care in the preparation of this book, but make no expressed or implied warranty of any kind and assume no responsibility for errors or omissions. No liability is assumed for incidental or consequential damages in connection with or arising out of the use of the information or programs contained herein.
    [Show full text]
  • The Software Heritage Graph Dataset: Public Software Development Under One Roof
    The Software Heritage Graph Dataset: Public software development under one roof Antoine Pietri Diomidis Spinellisy Stefano Zacchiroli Inria Athens University of Economics and Business University Paris Diderot and Inria France Greece France [email protected] [email protected] [email protected] Abstract—Software Heritage is the largest existing public software licence analysis and license compliance [14], [15]. archive of software source code and accompanying development However, many research studies are still being conducted on history: it currently spans more than five billion unique source significantly smaller subsets of the entire corpus of publicly code files and one billion unique commits, coming from more than 80 million software projects. available source code artifacts. This paper introduces the Software Heritage graph dataset: a The Software Heritage project [16], [17] aims at fixing this fully-deduplicated Merkle DAG representation of the Software gap, by collecting, preserving, and sharing the entire body Heritage archive. The dataset links together file content iden- of publicly available software source code, together with the tifiers, source code directories, Version Control System (VCS) associated development history, as it is captured by modern commits tracking evolution over time, up to the full states of VCS repositories as observed by Software Heritage during periodic version control systems (VCS)[18]. crawls. The dataset’s contents come from major development In this paper we introduce the Software Heritage Graph forges (including GitHub and GitLab), FOSS distributions (e.g., Dataset, a graph representation of all the source code artifacts Debian), and language-specific package managers (e.g., PyPI). archived by Software Heritage. The graph is a fully dedu- Crawling information is also included, providing timestamps plicated Merkle DAG [19] that links together: source code about when and where all archived source code artifacts have been observed in the wild.
    [Show full text]
  • Reproducible Research, Open Science Logging and Backing up Your Work Git Tips and Tricks, a Scientist Perspective
    Reproducible Research, Open Science Logging and backing up your work Git Tips and Tricks, a Scientist Perspective V. Danjean, A. Legrand, L. Stanisic University of Grenoble, CNRS, Inria Bordeaux June 7, 2016 Reproducible Research Webinar (Episode IV) 1 / 34 Foreword about the organization (1/2) There is currently a screencast of this seminar: https://mi2s.imag.fr/pm/direct The resulting video will be edited and available from GitHub that gathers all the information, slides, and resources: https://github.com/alegrand/RR_webinars/blob/master/README.org There is a few seconds delay between what we say and the screencast. We can have almost live interaction with other sites by using pad to comment and ask questions http://tinyurl.com/RRW-pad4 2 / 34 Foreword about the organization (2/2) No particular prerequisites: we will use command line and demo with a GUI Please install Git and SmartGit by following the instructions given on the RR_webinars GitHub page 1. General introduction plus basic Git usage( ≈ an hour) At any time, feel free to ask questions on the pad. Some of these questions may be ad- dressed "silently" by the other attendees, but do not hesitate to ask it out loudly for the remote ones 2. A short break 3. Slightly more advanced Git usage The actual part that is more devoted to practices favoring reproducible research Many other tutorials on Git but with a dierent perspective Introduction to Git internals by Scott Chacon (GitHub) Please. Stop Using Git by Matthew McCullough http://try.github.com/ http://git-scm.com/docs/gittutorial/
    [Show full text]
  • Free Software Needs Free Tools
    Free Software Needs Free Tools Benjamin Mako Hill [email protected] June 6, 2010 Over the last decade, free software developers have been repeatedly tempted by devel- opment tools that offer the ability to build free software more efficiently or powerfully. The only cost, we are told, is that the tools themselves are nonfree or run as network services with code we cannot see, copy, or run ourselves. In their decisions to use these tools and services – services such as BitKeeper, SourceForge, Google Code and GitHub – free software developers have made “ends-justify-the-means” decisions that trade away the freedom of both their developer communities and their users. These decisions to embrace nonfree and private development tools undermine our credibility in advocating for soft- ware freedom and compromise our freedom, and that of our users, in ways that we should reject. In 2002, Linus Torvalds announced that the kernel Linux would move to the “Bit- Keeper” distributed version control system (DVCS). While the decision generated much alarm and debate, BitKeeper allowed kernel developers to work in a distributed fashion in a way that, at the time, was unsupported by free software tools – some Linux developers decided that benefits were worth the trade-off in developers’ freedom. Three years later the skeptics were vindicated when BitKeeper’s owner, Larry McVoy, revoked several core kernel developers’ gratis licenses to BitKeeper after Andrew Tridgell attempted to write a free replacement for BitKeeper. Kernel developers were forced to write their own free software replacement: the project now known as Git. Of course, free software’s relationships to nonfree development tools is much larger than BitKeeper.
    [Show full text]
  • Indicators for Missing Maintainership in Collaborative Open Source Projects
    TECHNISCHE UNIVERSITÄT CAROLO-WILHELMINA ZU BRAUNSCHWEIG Studienarbeit Indicators for Missing Maintainership in Collaborative Open Source Projects Andre Klapper February 04, 2013 Institute of Software Engineering and Automotive Informatics Prof. Dr.-Ing. Ina Schaefer Supervisor: Michael Dukaczewski Affidavit Hereby I, Andre Klapper, declare that I wrote the present thesis without any assis- tance from third parties and without any sources than those indicated in the thesis itself. Braunschweig / Prague, February 04, 2013 Abstract The thesis provides an attempt to use freely accessible metadata in order to identify missing maintainership in free and open source software projects by querying various data sources and rating the gathered information. GNOME and Apache are used as case studies. License This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license. Keywords Maintenance, Activity, Open Source, Free Software, Metrics, Metadata, DOAP Contents List of Tablesx 1 Introduction1 1.1 Problem and Motivation.........................1 1.2 Objective.................................2 1.3 Outline...................................3 2 Theoretical Background4 2.1 Reasons for Inactivity..........................4 2.2 Problems Caused by Inactivity......................4 2.3 Ways to Pass Maintainership.......................5 3 Data Sources in Projects7 3.1 Identification and Accessibility......................7 3.2 Potential Sources and their Exploitability................7 3.2.1 Code Repositories.........................8 3.2.2 Mailing Lists...........................9 3.2.3 IRC Chat.............................9 3.2.4 Wikis............................... 10 3.2.5 Issue Tracking Systems...................... 11 3.2.6 Forums............................... 12 3.2.7 Releases.............................. 12 3.2.8 Patch Review........................... 13 3.2.9 Social Media............................ 13 3.2.10 Other Sources..........................
    [Show full text]
  • Pragmatic Version Control Using Git.Pdf
    Prepared exclusively for Trieu Nguyen Download at Boykma.Com What readers are saying about Pragmatic Version Control Using Git Pragmatic Version Control Using Git is an excellent guide to getting you started with Git. It will teach you not only how to get yourself started but also how to cooperate with others and how to keep your history clean. Pieter de Bie Author, GitX If you are thinking of using Git, I highly recommend this book. If you are not using a version control system (and code or create content on a computer), put the book down, slap yourself, pick the book back up, and buy it. Jacob Taylor Entrepreneur and Cofounder, SugarCRM Inc. Not only has this book convinced me that Git has something to offer over CVS and Subversion, but it has also showed me how I can benefit from using it myself even if I’m using it alone in a CVS/Subversion environment. I expect to be a full-time Git user soon after reading this, which is hard to believe considering this is the first distributed version control system I’ve ever looked at. Chuck Burgess 2008 PEAR Group Member Travis has done an excellent job taking a tricky subject and making it accessible, useful, and relevant. You’ll find distributed version control and Git much less mysterious after reading this book. Mike Mason Author, Pragmatic Version Control Using Subversion Prepared exclusively for Trieu Nguyen Download at Boykma.Com Pragmatic Version Control Using Git Travis Swicegood The Pragmatic Bookshelf Raleigh, North Carolina Dallas, Texas Prepared exclusively for Trieu Nguyen Download at Boykma.Com Many of the designations used by manufacturers and sellers to distinguish their prod- ucts are claimed as trademarks.
    [Show full text]
  • Zed Shaw's Hard Way Series
    ContentHereContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHereContentHereContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHereContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHereContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHereContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHereContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere 1. AnotherDefaultItem another one 2. RegularItem1NOTDEFAULT item 1 3. RegularItem2NOTDEFAULT has attached file for testing purposes Documents: LEARN PYTHON THE HARD WAY 3RD EDITION V413HAV_202101260858523250.PDF ContentHereContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHere ContentHereContentHereContentHere
    [Show full text]
  • Browsing the Free Software Commons
    Browsing the Free Soware Commons Stefano Zacchiroli University Paris Diderot & Inria — [email protected] 22 August 2018 OpenSym 2018 Paris, France THE GREAT LIBRARY OF SOURCE CODE Stefano Zacchiroli Browsing the Free Soware Commons 22/08/2018, OpenSym 1 / 23 Outline 1 The Soware Commons 2 Soware Heritage 3 Accessing the archive 4 Geing involved Stefano Zacchiroli Browsing the Free Soware Commons 22/08/2018, OpenSym 2 / 23 (Free) Soware is everywhere Software Stefano Zacchiroli Browsing the Free Soware Commons 22/08/2018, OpenSym 2 / 23 Soware source code is special Harold Abelson, Structure and Interpretation of Computer Programs “Programs must be wrien for people to read, and only incidentally for machines to execute.” ake 2 source code (excerpt) Net. queue in Linux (excerpt) Len Shustek, Computer History Museum “Source code provides a view into the mind of the designer.” Stefano Zacchiroli Browsing the Free Soware Commons 22/08/2018, OpenSym 3 / 23 Source code is a precious part of our commons are we taking care of it? Our Soware Commons Definition (Commons) The commons is the cultural and natural resources accessible to all members of a society, including natural materials such as air, water, and a habitable earth. These resources are held in common, not owned privately. https://en.wikipedia.org/wiki/Commons Definition (Soware Commons) The soware commons consists of all computer soware which is available at lile or no cost and which can be altered and reused with few restrictions. Thus all open source soware and all free soware are part of the [soware] commons. [...] https://en.wikipedia.org/wiki/Software_Commons Stefano Zacchiroli Browsing the Free Soware Commons 22/08/2018, OpenSym 4 / 23 Our Soware Commons Definition (Commons) The commons is the cultural and natural resources accessible to all members of a society, including natural materials such as air, water, and a habitable earth.
    [Show full text]
  • Verso Project Application Report 0.6 Public Document Info
    Verso Project Application Report Tero Hänninen Juho Nieminen Marko Peltola Heikki Salo Version 0.6 Public 4.8.2010 University of Jyväskylä Department of Mathematical Information Technology Jyväskylä Acceptor Date Signature Clarification Project manager __.__.2010 Customer __.__.2010 Instructor __.__.2010 Verso Project Application Report 0.6 Public Document Info Authors: • Tero Hänninen (TH) [email protected] 0400-240468 • Juho Nieminen (JN) [email protected] 050-3831825 • Marko Peltola (MP) [email protected] 041-4498622 • Heikki Salo (HS) [email protected] 050-3397894 Document name: Verso Project, Application Report Page count: 46 Abstract: Verso project developed a web application for source code manage- ment and publishing. The document goes through the background of the software, presents the user interface and the application structure and describes the program- ming and testing practices used in the project. The realization of functional require- ments and ideas for further development are also presented. In addition, there is a guide for future developers at the end. Keywords: Application report, application structure, Git, Gitorious, programming practise, Ruby on Rails, software project, software development, source code man- agement, testing, WWW interface, web application. i Verso Project Application Report 0.6 Public Project Contact Information Project group: Tero Hänninen [email protected] 0400-240468 Juho Nieminen [email protected] 050-3831825 Marko Peltola [email protected] 041-4498622 Heikki Salo [email protected] 050-3397894 Customers: Ville Tirronen [email protected] 014-2604987 Tero Tuovinen [email protected] 050-4413685 Paavo Nieminen [email protected] 040-5768507 Tapani Tarvainen [email protected] 014-2602752 Instructors: Jukka-Pekka Santanen [email protected] 014-2602756 Antti-Juhani Kaijanaho [email protected] 014-2602766 Contact information: Email lists [email protected] and [email protected].
    [Show full text]
  • Qmachine Documentation Release 1.2.4
    QMachine Documentation Release 1.2.4 Sean Wilkinson May 25, 2018 Contents 1 Overview 1 1.1 How it works...............................................1 1.2 How to use it...............................................2 1.3 How to contribute............................................2 2 HTTP API 3 2.1 Stable...................................................3 2.2 Experimental...............................................4 3 Browser client 5 3.1 Getting started..............................................5 3.2 Basic use.................................................6 3.3 Advanced use...............................................6 4 Node.js 7 4.1 Getting started..............................................7 4.2 API client.................................................7 4.3 API server................................................7 5 Ruby 9 5.1 Getting started..............................................9 5.2 API client.................................................9 5.3 API server................................................9 6 Running a local sandbox 11 6.1 Prerequisites............................................... 11 6.2 Node.js.................................................. 12 6.3 Ruby................................................... 12 7 Running on Platform-as-a-Service 15 7.1 One-click deployment to Heroku.................................... 15 7.2 Other platforms.............................................. 15 8 Source code 17 8.1 Browser client.............................................. 17 8.2 Main project..............................................
    [Show full text]
  • Software Heritage: Why and How to Preserve Software Source Code∗
    Software Heritage: Why and How to Preserve Software Source Code∗ Roberto Di Cosmo Stefano Zacchiroli Inria and University Paris Diderot University Paris Diderot and Inria France France [email protected] [email protected] ABSTRACT platforms and that often become, once optimized, incomprehensi- Software is now a key component present in all aspects of our ble for human beings. Rather, knowledge is contained in software society. Its preservation has attracted growing attention over the source code which is, as eloquently stated in the very well crafted past years within the digital preservation community. We claim definition found in the GPL license [13], “the preferred form [of a that source code—the only representation of software that contains program] for making modifications to it [as a developer]”. human readable knowledge—is a precious digital object that needs Yes, software source code is a unique form of knowledge which special handling: it must be a first class citizen in the preservation is designed to be understood by a human being, the developer, and landscape and we need to take action immediately, given the in- at the same time is easily converted into machine executable form. creasingly more frequent incidents that result in permanent losses As a digital object, software source code is also subject to a peculiar of source code collections. workflow: it is routinely evolved to cater for new needs and changed In this paper we present Software Heritage, an ambitious ini- contexts. To really understand software source code, access to its tiative to collect, preserve, and share the entire corpus of publicly entire development history is an essential condition.
    [Show full text]
  • Git Pocket Guide
    Git Pocket Guide Richard E. Silverman Git Pocket Guide by Richard E. Silverman Copyright © 2013 Richard E. Silverman. All rights reserved. Printed in the United States of America. Published by O’Reilly Media, Inc., 1005 Gravenstein Highway North, Sebasto‐ pol, CA 95472. O’Reilly books may be purchased for educational, business, or sales promotional use. Online editions are also available for most titles (http://my.safaribookson line.com). For more information, contact our corporate/institutional sales de‐ partment: 800-998-9938 or [email protected]. Editors: Mike Loukides and Meghan Blanchette Production Editor: Melanie Yarbrough Copyeditor: Kiel Van Horn Proofreader: Linley Dolby Indexer: Judith McConville Cover Designer: Randy Comer Interior Designer: David Futato Illustrator: Rebecca Demarest June 2013: First Edition Revision History for the First Edition: 2013-06-24: First release 2013-07-10: Second release 2013-08-30: Third release See http://oreilly.com/catalog/errata.csp?isbn=9781449325862 for release de‐ tails. Nutshell Handbook, the Nutshell Handbook logo, and the O’Reilly logo are registered trademarks of O’Reilly Media, Inc. Git Pocket Guide, the image of a long-eared bat, and related trade dress are trademarks of O’Reilly Media, Inc. Many of the designations used by manufacturers and sellers to distinguish their products are claimed as trademarks. Where those designations appear in this book, and O’Reilly Media, Inc., was aware of a trademark claim, the designations have been printed in caps or initial caps. While every precaution has been taken in the preparation of this book, the publisher and author assume no responsibility for errors or omissions, or for damages resulting from the use of the information contained herein.
    [Show full text]