API tools faq
paste
Advertisement
SatanicSanta

Lath helps with git

SatanicSanta
Sep 1st, 2014
226
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.41 KB | None | 0 0
raw download clone embed print report
  1. [16:24:13] <Lathanael> open the terminal and enter
  2. [16:24:19] <Lathanael> git init
  3. [16:25:37] <@SatanicSanta> back
  4. [16:26:01] <@SatanicSanta> Initialized empty git repository in Users/my name/Desktop/.git
  5. [16:26:06] <@SatanicSanta> This feels incorrect :P
  6. [16:26:17] <Lathanael> well you should navigate to the folder :P
  7. [16:26:22] <@SatanicSanta> Yes
  8. [16:26:23] <@SatanicSanta> That's a good idea
  9. [16:27:01] <@SatanicSanta> Wait, which level?
  10. [16:27:16] <Lathanael> and you may want to put that readme and .gitignore into the "BigTrees" folder
  11. [16:27:27] <@SatanicSanta> http://puu.sh/bhCBR/2c98c71489.png
  12. [16:27:29] <Lathanael> i have no idea how its called on you system :P
  13. [16:27:49] <@SatanicSanta> navigate to which part? E-Flux or forge-src?
  14. [16:27:54] <Lathanael> then it should be the forge
  15. [16:28:10] <Lathanael> as i guess you want the stuff in there tracked
  16. [16:28:25] <@SatanicSanta> yeh
  17. [16:28:30] <@SatanicSanta> did that
  18. [16:28:53] <Lathanael> copy the Readme and .gitignore from the hary spice folder
  19. [16:29:01] <Lathanael> into the forge folder
  20. [16:29:29] <Lathanael> and get rid of that hairy stuff afterwards
  21. [16:29:43] <@SatanicSanta> alright
  22. [16:30:06] <Lathanael> now do the git init again (and make sure you are in the right folder :P)
  23. [16:30:13] <@SatanicSanta> the forge src?
  24. [16:30:22] <Lathanael> you should get a .git folder in the forge folder then
  25. [16:30:33] <@SatanicSanta> I already have one :P
  26. [16:30:42] <Lathanael> wtf?!
  27. [16:30:50] <Lathanael> was it in the hairy folder?
  28. [16:30:52] <@SatanicSanta> from [16:24:13] <Lathanael> open the terminal and enter [16:24:19] <Lathanael> git init
  29. [16:30:54] <@SatanicSanta> no it wasnt
  30. [16:31:27] <Lathanael> ahh so you already intitialized the folder in the command prompt?
  31. [16:31:32] <@SatanicSanta> yes
  32. [16:31:52] <Lathanael> what happens if you execute git status
  33. [16:31:53] <Lathanael> ?
  34. [16:32:02] <@SatanicSanta> in the command prompt?
  35. [16:32:15] <Lathanael> yes
  36. [16:33:25] <@SatanicSanta> http://puu.sh/bhD2v/a74d335e3d.png
  37. [16:33:26] <@SatanicSanta> that
  38. [16:33:45] <Lathanael> that does look correct
  39. [16:34:06] <Lathanael> now you should add everyhing you do NOT want to be tracked in the gitignore file
  40. [16:34:20] <Lathanael> http://puu.sh/bhD2R/e11a1c6d84.gitignore
  41. [16:34:23] <@SatanicSanta> Okay. I feel like that src/ directory should be tracke
  42. [16:34:27] <Lathanael> that would be mine
  43. [16:34:38] <Lathanael> as an example
  44. [16:34:41] <@SatanicSanta> And yeh, Striking already did the gitignore
  45. [16:34:49] <@SatanicSanta> https://github.com/satanicsanta/hairy-spice/blob/master/.gitignore
  46. [16:35:16] <Lathanael> you also don't want that README.txt i guess as its from forge
  47. [16:35:42] <Lathanael> the .settings should also not be put on a repo
  48. [16:35:58] <@SatanicSanta> added both of those
  49. [16:36:27] <Lathanael> whats the out folder used for?
  50. [16:36:31] <@SatanicSanta> idk
  51. [16:36:40] <@SatanicSanta> oh
  52. [16:36:46] <@SatanicSanta> It appears to be build-related
  53. [16:36:50] <@SatanicSanta> So I don't want it there
  54. [16:36:56] <Lathanael> probably
  55. [16:37:11] <@SatanicSanta> Otherwise there's gonna be obfuscated and deobfuscated code on the repo :P
  56. [16:37:46] <Lathanael> after you added those these folders/files should not be present if you do "git status" again
  57. [16:38:05] <Lathanael> and apparently i can not type.....
  58. [16:38:19] <@SatanicSanta> Yeah
  59. [16:38:27] <@SatanicSanta> There's now the README.md, .gitignore, build.gradle, and src
  60. [16:38:31] <@SatanicSanta> Perfect
  61. [16:38:37] <Lathanael> no do
  62. [16:38:40] <Lathanael> git add .
  63. [16:38:54] <@SatanicSanta> With the period?
  64. [16:38:57] <Lathanael> yes
  65. [16:39:03] <Lathanael> the period is important here
  66. [16:39:08] <@SatanicSanta> What does this do?
  67. [16:39:19] <Lathanael> as it indicates to git to look for all new or changed files
  68. [16:39:36] <Lathanael> and stage then to be commited
  69. [16:39:52] <Lathanael> *them
  70. [16:40:05] <Lathanael> once you've got that
  71. [16:40:26] <Lathanael> git commit -m 'first commit'
  72. [16:40:36] <Lathanael> aeh stopp
  73. [16:40:45] <@SatanicSanta> wat
  74. [16:40:47] <@SatanicSanta> that last part
  75. [16:40:57] <@SatanicSanta> not the git commit stuff
  76. [16:41:03] <@SatanicSanta> but whatever you said after that :P
  77. [16:41:15] <Lathanael> alcohol and thinking isn't working well...
  78. [16:41:19] <@SatanicSanta> Ah yes
  79. [16:41:20] <Lathanael> together
  80. [16:41:28] <Lathanael> but you can ignore the stop
  81. [16:41:34] <Lathanael> the commit command should work
  82. [16:41:39] <@SatanicSanta> It says it does
  83. [16:41:43] <Lathanael> was getting ahead of myself
  84. [16:41:51] <@SatanicSanta> But it isn't present in the actual repo :/
  85. [16:42:19] <Lathanael> thats because we haven't pushed it yet
  86. [16:42:23] <@SatanicSanta> o
  87. [16:42:28] <Lathanael> next step is to add the repo
  88. [16:42:51] <Lathanael> to do that enter:
  89. [16:42:55] <Lathanael> git remote add origin https://github.com/satanicsanta/hairy-spice.git
  90. [16:43:19] <@SatanicSanta> done
  91. [16:44:12] <Lathanael> now the final step
  92. [16:44:25] <Lathanael> git push origin master
  93. [16:44:50] <@SatanicSanta> !topicappend For my own sake: git status, git commit -m 'summary thing', git push origin master
  94. [16:44:50] Spock [Logic@enterprise.services.esper.net] has changed topic to "Channel for Energetic Flux crap | https://github.com/satanicsanta/hairy-spice | For my own sake: git status, git commit -m 'summary thing', git push origin master"
  95. [16:45:27] <@SatanicSanta> defack
  96. [16:45:35] <Lathanael> replace the git status with git add -A
  97. [16:45:59] <@SatanicSanta> !topic Channel for Energetic Flux crap | https://github.com/satanicsanta/hairy-spice | For my own sake: git add -A, git commit -m 'summary thing', git push origin master
  98. [16:45:59] Spock [Logic@enterprise.services.esper.net] has changed topic to "Channel for Energetic Flux crap | https://github.com/satanicsanta/hairy-spice | For my own sake: git add -A, git commit -m 'summary thing', git push origin master"
  99. [16:46:25] <@SatanicSanta> Lathanael: http://puu.sh/bhDVO/8c708ece81.png
  100. [16:47:06] <Lathanael> for this time only do:
  101. [16:47:17] <Lathanael> git push origin master --force
  102. [16:47:48] <@SatanicSanta> thank you lath :D
  103. [16:48:09] SatanicSanta saves this on pastebin for future use when he inevitably forgets all of this
  104. [16:48:26] <Lathanael> but keep in mind to not use the force option when you are not 100% sure it'll work
  105. [16:48:42] <Lathanael> cause it rewrites the commit tree as you can see on your repo now
  106. [16:48:57] <Lathanael> thus work others have done might get lost
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!