Advertisement
Guest User

Untitled

a guest
Oct 18th, 2019
244
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.33 KB | None | 0 0
  1. C:\Users\Calvin\AppData\Local\GitHubUnity\git>cd /D A:/Projects/SolarisRPG/Solar
  2. is RPG
  3.  
  4. A:\Projects\SolarisRPG\Solaris RPG>git
  5. usage: git [--version] [--help] [-C <path>] [-c <name>=<value>]
  6. [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
  7. [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]
  8. [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
  9. <command> [<args>]
  10.  
  11. These are common Git commands used in various situations:
  12.  
  13. start a working area (see also: git help tutorial)
  14. clone Clone a repository into a new directory
  15. init Create an empty Git repository or reinitialize an existing one
  16.  
  17. work on the current change (see also: git help everyday)
  18. add Add file contents to the index
  19. mv Move or rename a file, a directory, or a symlink
  20. reset Reset current HEAD to the specified state
  21. rm Remove files from the working tree and from the index
  22.  
  23. examine the history and state (see also: git help revisions)
  24. bisect Use binary search to find the commit that introduced a bug
  25. grep Print lines matching a pattern
  26. log Show commit logs
  27. show Show various types of objects
  28. status Show the working tree status
  29.  
  30. grow, mark and tweak your common history
  31. branch List, create, or delete branches
  32. checkout Switch branches or restore working tree files
  33. commit Record changes to the repository
  34. diff Show changes between commits, commit and working tree, etc
  35. merge Join two or more development histories together
  36. rebase Reapply commits on top of another base tip
  37. tag Create, list, delete or verify a tag object signed with GPG
  38.  
  39. collaborate (see also: git help workflows)
  40. fetch Download objects and refs from another repository
  41. pull Fetch from and integrate with another repository or a local branch
  42.  
  43. push Update remote refs along with associated objects
  44.  
  45. 'git help -a' and 'git help -g' list available subcommands and some
  46. concept guides. See 'git help <command>' or 'git help <concept>'
  47. to read about a specific subcommand or concept.
  48.  
  49. A:\Projects\SolarisRPG\Solaris RPG>git status
  50. On branch master
  51. Your branch is up to date with 'origin/master'.
  52.  
  53. nothing to commit, working tree clean
  54.  
  55. A:\Projects\SolarisRPG\Solaris RPG>git branch
  56. feat/crafting
  57. * master
  58.  
  59. A:\Projects\SolarisRPG\Solaris RPG>git merge feat/crafting
  60. Updating 1fc3ed4..f1b1445(130/139)
  61. git-lfs filter-process: git-lfs: command not found
  62. fatal: The remote end hung up unexpectedly
  63.  
  64. A:\Projects\SolarisRPG\Solaris RPG>git status
  65. On branch master
  66. Your branch is up to date with 'origin/master'.
  67.  
  68. Changes not staged for commit:
  69. (use "git add/rm <file>..." to update what will be committed)
  70. (use "git checkout -- <file>..." to discard changes in working directory)
  71.  
  72. modified: Assets/Graphics/UI/Arrow.png.meta
  73. modified: Assets/Plugins/GitHub/Editor/libsfw.bundle.meta
  74. modified: Assets/Plugins/GitHub/Editor/libsfw.so.meta
  75. modified: Assets/Plugins/GitHub/Editor/x64/pthreadVC2.dll.meta
  76. modified: Assets/Plugins/GitHub/Editor/x64/sfw_x64.dll.meta
  77. modified: Assets/Plugins/GitHub/Editor/x86/pthreadVC2.dll.meta
  78. modified: Assets/Plugins/GitHub/Editor/x86/sfw_x86.dll.meta
  79. modified: Assets/Resources/Prefabs/UI/Windows/Diplomacy.prefab
  80. modified: Assets/Resources/Prefabs/UI/Windows/Generic/KeyValuePanel.pr
  81. efab
  82. modified: Assets/Resources/Prefabs/UI/Windows/InventoryUI.prefab
  83. modified: Assets/Scenes/Game.unity
  84. modified: Assets/Scenes/MainMenu.unity
  85. modified: Assets/Scenes/SplashScreen.unity
  86. modified: Assets/Scripts/GameControls/ContextMenu.cs
  87. modified: Assets/Scripts/GameControls/Controller/Controller.cs
  88. modified: Assets/Scripts/GameControls/Controller/UIController.cs
  89. modified: Assets/Scripts/GameControls/Selection.cs
  90. modified: Assets/Scripts/Objects/Items/Item.cs
  91. modified: Assets/Scripts/Objects/Items/ItemData.cs
  92. modified: Assets/Scripts/Objects/Items/ItemModule.cs
  93. modified: Assets/Scripts/Objects/Items/Materials.cs
  94. modified: Assets/Scripts/Objects/Items/Resources.cs
  95. deleted: Assets/Scripts/UI/CraftingUI.cs
  96. deleted: Assets/Scripts/UI/CraftingUI.cs.meta
  97. modified: Assets/Scripts/UI/Diplomacy.cs
  98. modified: Assets/Scripts/UI/Window.cs
  99. modified: Assets/Scripts/Utility.cs
  100.  
  101. Untracked files:
  102. (use "git add <file>..." to include in what will be committed)
  103.  
  104. Assets/Resources/Prefabs/Objects/Generic.meta
  105. Assets/Resources/Prefabs/Objects/Generic/
  106. Assets/Resources/Prefabs/UI/Windows/CraftingUI.prefab
  107. Assets/Resources/Prefabs/UI/Windows/CraftingUI.prefab.meta
  108. Assets/Resources/Prefabs/UI/Windows/Generic/CollapsibleList.prefab
  109. Assets/Resources/Prefabs/UI/Windows/Generic/CollapsibleList.prefab.meta
  110. Assets/Resources/Prefabs/UI/Windows/Generic/KeyValueList.prefab
  111. Assets/Resources/Prefabs/UI/Windows/Generic/KeyValueList.prefab.meta
  112. Assets/Resources/Prefabs/UI/Windows/Generic/ModuleDisplayPanel.prefab
  113. Assets/Resources/Prefabs/UI/Windows/Generic/ModuleDisplayPanel.prefab.me
  114. ta
  115. Assets/Resources/Prefabs/UI/Windows/Generic/TextObject.prefab
  116. Assets/Resources/Prefabs/UI/Windows/Generic/TextObject.prefab.meta
  117. Assets/Resources/Prefabs/UI/Windows/Generic/ValueSlider.prefab
  118. Assets/Resources/Prefabs/UI/Windows/Generic/ValueSlider.prefab.meta
  119. Assets/Scripts/Objects/Items/ItemTypes.cs
  120. Assets/Scripts/Objects/Items/ItemTypes.cs.meta
  121. Assets/Scripts/UI/Crafting.meta
  122. Assets/Scripts/UI/Crafting/
  123. Assets/Scripts/UI/Generic.meta
  124. Assets/Scripts/UI/Generic/
  125. Assets/TextMesh Pro.meta
  126. Assets/TextMesh Pro/
  127.  
  128. no changes added to commit (use "git add" and/or "git commit -a")
  129.  
  130. A:\Projects\SolarisRPG\Solaris RPG>git add .
  131.  
  132. A:\Projects\SolarisRPG\Solaris RPG>git reset --hard HEAD
  133. HEAD is now at 1fc3ed4 Initial Commit
  134.  
  135. A:\Projects\SolarisRPG\Solaris RPG>git status
  136. On branch master
  137. Your branch is up to date with 'origin/master'.
  138.  
  139. nothing to commit, working tree clean
  140.  
  141. A:\Projects\SolarisRPG\Solaris RPG>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement