Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- C:\Users\Calvin\AppData\Local\GitHubUnity\git>cd /D A:/Projects/SolarisRPG/Solar
- is RPG
- A:\Projects\SolarisRPG\Solaris RPG>git
- usage: git [--version] [--help] [-C <path>] [-c <name>=<value>]
- [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
- [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
- [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
- <command> [<args>]
- These are common Git commands used in various situations:
- start a working area (see also: git help tutorial)
- clone Clone a repository into a new directory
- init Create an empty Git repository or reinitialize an existing one
- work on the current change (see also: git help everyday)
- add Add file contents to the index
- mv Move or rename a file, a directory, or a symlink
- reset Reset current HEAD to the specified state
- rm Remove files from the working tree and from the index
- examine the history and state (see also: git help revisions)
- bisect Use binary search to find the commit that introduced a bug
- grep Print lines matching a pattern
- log Show commit logs
- show Show various types of objects
- status Show the working tree status
- grow, mark and tweak your common history
- branch List, create, or delete branches
- checkout Switch branches or restore working tree files
- commit Record changes to the repository
- diff Show changes between commits, commit and working tree, etc
- merge Join two or more development histories together
- rebase Reapply commits on top of another base tip
- tag Create, list, delete or verify a tag object signed with GPG
- collaborate (see also: git help workflows)
- fetch Download objects and refs from another repository
- pull Fetch from and integrate with another repository or a local branch
- push Update remote refs along with associated objects
- 'git help -a' and 'git help -g' list available subcommands and some
- concept guides. See 'git help <command>' or 'git help <concept>'
- to read about a specific subcommand or concept.
- A:\Projects\SolarisRPG\Solaris RPG>git status
- On branch master
- Your branch is up to date with 'origin/master'.
- nothing to commit, working tree clean
- A:\Projects\SolarisRPG\Solaris RPG>git branch
- feat/crafting
- * master
- A:\Projects\SolarisRPG\Solaris RPG>git merge feat/crafting
- Updating 1fc3ed4..f1b1445(130/139)
- git-lfs filter-process: git-lfs: command not found
- fatal: The remote end hung up unexpectedly
- A:\Projects\SolarisRPG\Solaris RPG>git status
- On branch master
- Your branch is up to date with 'origin/master'.
- Changes not staged for commit:
- (use "git add/rm <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
- modified: Assets/Graphics/UI/Arrow.png.meta
- modified: Assets/Plugins/GitHub/Editor/libsfw.bundle.meta
- modified: Assets/Plugins/GitHub/Editor/libsfw.so.meta
- modified: Assets/Plugins/GitHub/Editor/x64/pthreadVC2.dll.meta
- modified: Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll.meta
- modified: Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll.meta
- modified: Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll.meta
- modified: Assets/Resources/Prefabs/UI/Windows/Diplomacy.prefab
- modified: Assets/Resources/Prefabs/UI/Windows/Generic/KeyValuePanel.pr
- efab
- modified: Assets/Resources/Prefabs/UI/Windows/InventoryUI.prefab
- modified: Assets/Scenes/Game.unity
- modified: Assets/Scenes/MainMenu.unity
- modified: Assets/Scenes/SplashScreen.unity
- modified: Assets/Scripts/GameControls/ContextMenu.cs
- modified: Assets/Scripts/GameControls/Controller/Controller.cs
- modified: Assets/Scripts/GameControls/Controller/UIController.cs
- modified: Assets/Scripts/GameControls/Selection.cs
- modified: Assets/Scripts/Objects/Items/Item.cs
- modified: Assets/Scripts/Objects/Items/ItemData.cs
- modified: Assets/Scripts/Objects/Items/ItemModule.cs
- modified: Assets/Scripts/Objects/Items/Materials.cs
- modified: Assets/Scripts/Objects/Items/Resources.cs
- deleted: Assets/Scripts/UI/CraftingUI.cs
- deleted: Assets/Scripts/UI/CraftingUI.cs.meta
- modified: Assets/Scripts/UI/Diplomacy.cs
- modified: Assets/Scripts/UI/Window.cs
- modified: Assets/Scripts/Utility.cs
- Untracked files:
- (use "git add <file>..." to include in what will be committed)
- Assets/Resources/Prefabs/Objects/Generic.meta
- Assets/Resources/Prefabs/Objects/Generic/
- Assets/Resources/Prefabs/UI/Windows/CraftingUI.prefab
- Assets/Resources/Prefabs/UI/Windows/CraftingUI.prefab.meta
- Assets/Resources/Prefabs/UI/Windows/Generic/CollapsibleList.prefab
- Assets/Resources/Prefabs/UI/Windows/Generic/CollapsibleList.prefab.meta
- Assets/Resources/Prefabs/UI/Windows/Generic/KeyValueList.prefab
- Assets/Resources/Prefabs/UI/Windows/Generic/KeyValueList.prefab.meta
- Assets/Resources/Prefabs/UI/Windows/Generic/ModuleDisplayPanel.prefab
- Assets/Resources/Prefabs/UI/Windows/Generic/ModuleDisplayPanel.prefab.me
- ta
- Assets/Resources/Prefabs/UI/Windows/Generic/TextObject.prefab
- Assets/Resources/Prefabs/UI/Windows/Generic/TextObject.prefab.meta
- Assets/Resources/Prefabs/UI/Windows/Generic/ValueSlider.prefab
- Assets/Resources/Prefabs/UI/Windows/Generic/ValueSlider.prefab.meta
- Assets/Scripts/Objects/Items/ItemTypes.cs
- Assets/Scripts/Objects/Items/ItemTypes.cs.meta
- Assets/Scripts/UI/Crafting.meta
- Assets/Scripts/UI/Crafting/
- Assets/Scripts/UI/Generic.meta
- Assets/Scripts/UI/Generic/
- Assets/TextMesh Pro.meta
- Assets/TextMesh Pro/
- no changes added to commit (use "git add" and/or "git commit -a")
- A:\Projects\SolarisRPG\Solaris RPG>git add .
- A:\Projects\SolarisRPG\Solaris RPG>git reset --hard HEAD
- HEAD is now at 1fc3ed4 Initial Commit
- A:\Projects\SolarisRPG\Solaris RPG>git status
- On branch master
- Your branch is up to date with 'origin/master'.
- nothing to commit, working tree clean
- A:\Projects\SolarisRPG\Solaris RPG>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement