Advertisement
Guest User

I hate Git

a guest
Nov 3rd, 2021
157
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 17.82 KB | None | 0 0
  1. > git remote add CHANapp https://github.com/ImperatorOfIntellectualism/CHANapp.git
  2. > git status -z -u
  3. > git symbolic-ref --short HEAD
  4. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  5. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  6. > git remote --verbose
  7. > git config --get commit.template
  8. > git fetch CHANapp
  9. > git ls-files --stage -- D:\CODE\chanapp\pages\index.tsx
  10. > git show --textconv :chanapp/pages/index.tsx
  11. From https://github.com/ImperatorOfIntellectualism/CHANapp
  12. * [new branch] main -> CHANapp/main
  13. > git status -z -u
  14. > git symbolic-ref --short HEAD
  15. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  16. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  17. > git remote --verbose
  18. > git config --get commit.template
  19. > git ls-files --stage -- D:\CODE\chanapp\pages\index.tsx
  20. > git show --textconv :chanapp/pages/index.tsx
  21. > git status -z -u
  22. > git symbolic-ref --short HEAD
  23. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  24. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  25. > git remote --verbose
  26. > git config --get commit.template
  27. > git add -A -- .
  28. warning: LF will be replaced by CRLF in chanapp/.eslintrc.json.
  29. The file will have its original line endings in your working directory
  30. warning: LF will be replaced by CRLF in chanapp/.gitignore.
  31. The file will have its original line endings in your working directory
  32. warning: LF will be replaced by CRLF in chanapp/README.md.
  33. The file will have its original line endings in your working directory
  34. warning: LF will be replaced by CRLF in chanapp/next.config.js.
  35. The file will have its original line endings in your working directory
  36. warning: LF will be replaced by CRLF in chanapp/package-lock.json.
  37. The file will have its original line endings in your working directory
  38. warning: LF will be replaced by CRLF in chanapp/package.json.
  39. The file will have its original line endings in your working directory
  40. warning: LF will be replaced by CRLF in chanapp/pages/_app.tsx.
  41. The file will have its original line endings in your working directory
  42. warning: LF will be replaced by CRLF in chanapp/pages/api/hello.ts.
  43. The file will have its original line endings in your working directory
  44. warning: LF will be replaced by CRLF in chanapp/pages/index.tsx.
  45. The file will have its original line endings in your working directory
  46. warning: LF will be replaced by CRLF in chanapp/public/vercel.svg.
  47. The file will have its original line endings in your working directory
  48. warning: LF will be replaced by CRLF in chanapp/styles/Home.module.css.
  49. The file will have its original line endings in your working directory
  50. warning: LF will be replaced by CRLF in chanapp/tsconfig.json.
  51. The file will have its original line endings in your working directory
  52. warning: LF will be replaced by CRLF in package-lock.json.
  53. The file will have its original line endings in your working directory
  54. warning: LF will be replaced by CRLF in package.json.
  55. The file will have its original line endings in your working directory
  56. warning: LF will be replaced by CRLF in src/migrations/Migration20211026094315.ts.
  57. The file will have its original line endings in your working directory
  58. warning: LF will be replaced by CRLF in tsconfig.json.
  59. The file will have its original line endings in your working directory
  60. > git -c user.useConfigOnly=true commit --quiet --allow-empty-message --file -
  61. > git status -z -u
  62. > git symbolic-ref --short HEAD
  63. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  64. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  65. > git remote --verbose
  66. > git config --get commit.template
  67. > git ls-files --stage -- D:\CODE\chanapp\pages\index.tsx
  68. > git cat-file -s 2059d02e270c652da877dc72839a5669c59392b8
  69. > git show --textconv :chanapp/pages/index.tsx
  70. > git status -z -u
  71. > git symbolic-ref --short HEAD
  72. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  73. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  74. > git remote --verbose
  75. > git config --get commit.template
  76. > git push CHANapp main
  77. To https://github.com/ImperatorOfIntellectualism/CHANapp.git
  78. ! [rejected] main -> main (non-fast-forward)
  79. error: failed to push some refs to 'https://github.com/ImperatorOfIntellectualism/CHANapp.git'
  80. hint: Updates were rejected because the tip of your current branch is behind
  81. hint: its remote counterpart. Integrate the remote changes (e.g.
  82. hint: 'git pull ...') before pushing again.
  83. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  84. > git log --oneline --cherry main...main@{upstream} --
  85. fatal: no upstream configured for branch 'main'
  86. > git pull --tags
  87. There is no tracking information for the current branch.
  88. Please specify which branch you want to merge with.
  89. See git-pull(1) for details.
  90.  
  91. git pull <remote> <branch>
  92.  
  93. If you wish to set tracking information for this branch you can do so with:
  94.  
  95. git branch --set-upstream-to=CHANapp/<branch> main
  96. > git ls-files --stage -- D:\CODE\chanapp\pages\index.tsx
  97. > git cat-file -s 2059d02e270c652da877dc72839a5669c59392b8
  98. > git show --textconv :chanapp/pages/index.tsx
  99. > git status -z -u
  100. > git symbolic-ref --short HEAD
  101. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  102. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  103. > git remote --verbose
  104. > git config --get commit.template
  105. > git log --oneline --cherry main...main@{upstream} --
  106. fatal: no upstream configured for branch 'main'
  107. > git pull --tags CHANapp main
  108. From https://github.com/ImperatorOfIntellectualism/CHANapp
  109. * branch main -> FETCH_HEAD
  110. fatal: refusing to merge unrelated histories
  111. > git ls-files --stage -- D:\CODE\chanapp\pages\index.tsx
  112. > git cat-file -s 2059d02e270c652da877dc72839a5669c59392b8
  113. > git show --textconv :chanapp/pages/index.tsx
  114. > git status -z -u
  115. > git symbolic-ref --short HEAD
  116. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  117. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  118. > git remote --verbose
  119. > git config --get commit.template
  120. > git push CHANapp main
  121. To https://github.com/ImperatorOfIntellectualism/CHANapp.git
  122. ! [rejected] main -> main (non-fast-forward)
  123. error: failed to push some refs to 'https://github.com/ImperatorOfIntellectualism/CHANapp.git'
  124. hint: Updates were rejected because the tip of your current branch is behind
  125. hint: its remote counterpart. Integrate the remote changes (e.g.
  126. hint: 'git pull ...') before pushing again.
  127. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  128. > git show --textconv :dist/index.js
  129. > git ls-files --stage -- D:\CODE\dist\index.js
  130. > git cat-file -s d6cf00e78b8901535facadfd2f1b02afefe5ec2f
  131. > git show --textconv :src/index.ts
  132. > git ls-files --stage -- D:\CODE\src\index.ts
  133. > git cat-file -s f0ae144245ab480bd437b97be9d58d267399b602
  134. > git push CHANapp main
  135. To https://github.com/ImperatorOfIntellectualism/CHANapp.git
  136. ! [rejected] main -> main (non-fast-forward)
  137. error: failed to push some refs to 'https://github.com/ImperatorOfIntellectualism/CHANapp.git'
  138. hint: Updates were rejected because the tip of your current branch is behind
  139. hint: its remote counterpart. Integrate the remote changes (e.g.
  140. hint: 'git pull ...') before pushing again.
  141. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  142. > git log --oneline --cherry main...main@{upstream} --
  143. fatal: no upstream configured for branch 'main'
  144. > git pull --tags
  145. There is no tracking information for the current branch.
  146. Please specify which branch you want to merge with.
  147. See git-pull(1) for details.
  148.  
  149. git pull <remote> <branch>
  150.  
  151. If you wish to set tracking information for this branch you can do so with:
  152.  
  153. git branch --set-upstream-to=CHANapp/<branch> main
  154. > git ls-files --stage -- D:\CODE\src\index.ts
  155. > git cat-file -s f0ae144245ab480bd437b97be9d58d267399b602
  156. > git show --textconv :src/index.ts
  157. > git status -z -u
  158. > git symbolic-ref --short HEAD
  159. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  160. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  161. > git remote --verbose
  162. > git config --get commit.template
  163. > git log --oneline --cherry main...main@{upstream} --
  164. fatal: no upstream configured for branch 'main'
  165. > git pull --tags -r
  166. There is no tracking information for the current branch.
  167. Please specify which branch you want to rebase against.
  168. See git-pull(1) for details.
  169.  
  170. git pull <remote> <branch>
  171.  
  172. If you wish to set tracking information for this branch you can do so with:
  173.  
  174. git branch --set-upstream-to=<remote>/<branch> main
  175. > git ls-files --stage -- D:\CODE\src\index.ts
  176. > git cat-file -s f0ae144245ab480bd437b97be9d58d267399b602
  177. > git show --textconv :src/index.ts
  178. > git status -z -u
  179. > git symbolic-ref --short HEAD
  180. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  181. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  182. > git remote --verbose
  183. > git config --get commit.template
  184. > git log --oneline --cherry main...main@{upstream} --
  185. fatal: no upstream configured for branch 'main'
  186. > git pull --tags CHANapp main
  187. From https://github.com/ImperatorOfIntellectualism/CHANapp
  188. * branch main -> FETCH_HEAD
  189. fatal: refusing to merge unrelated histories
  190. > git ls-files --stage -- D:\CODE\src\index.ts
  191. > git cat-file -s f0ae144245ab480bd437b97be9d58d267399b602
  192. > git show --textconv :src/index.ts
  193. > git status -z -u
  194. > git symbolic-ref --short HEAD
  195. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  196. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  197. > git remote --verbose
  198. > git config --get commit.template
  199. > git status -z -u
  200. > git symbolic-ref --short HEAD
  201. > git for-each-ref --format=%(refname)%00%(upstream:short)%00%(objectname)%00%(upstream:track) refs/heads/main refs/remotes/main
  202. > git ls-files --stage -- D:\CODE\src\index.ts
  203. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  204. > git remote --verbose
  205. > git cat-file -s f0ae144245ab480bd437b97be9d58d267399b602
  206. > git config --get commit.template
  207. > git show --textconv :src/index.ts
  208. > git push
  209. fatal: No configured push destination.
  210. Either specify the URL from the command-line or configure a remote repository using
  211.  
  212. git remote add <name> <url>
  213.  
  214. and then push using the remote name
  215.  
  216. git push <name>
  217. > git push CHANapp main
  218. To https://github.com/ImperatorOfIntellectualism/CHANapp.git
  219. ! [rejected] main -> main (non-fast-forward)
  220. error: failed to push some refs to 'https://github.com/ImperatorOfIntellectualism/CHANapp.git'
  221. hint: Updates were rejected because the tip of your current branch is behind
  222. hint: its remote counterpart. Integrate the remote changes (e.g.
  223. hint: 'git pull ...') before pushing again.
  224. hint: See the 'Note about fast-forwards' in 'git push --help' for details.
  225. > git rebase CHANapp/main
  226. > git ls-files --stage -- D:\CODE\src\index.ts
  227. > git cat-file -s f0ae144245ab480bd437b97be9d58d267399b602
  228. > git show --textconv :src/index.ts
  229. Rebasing (1/6)
  230. Rebasing (2/6)
  231. Rebasing (3/6)
  232. error: The following untracked working tree files would be overwritten by merge:
  233. node_modules/.bin/acorn
  234. node_modules/.bin/acorn.cmd
  235. node_modules/.bin/acorn.ps1
  236. node_modules/.bin/is-ci
  237. node_modules/.bin/is-ci.cmd
  238. node_modules/.bin/is-ci.ps1
  239. node_modules/.bin/nodemon
  240. node_modules/.bin/nodemon.cmd
  241. node_modules/.bin/nodemon.ps1
  242. node_modules/.bin/nodetouch
  243. node_modules/.bin/nodetouch.cmd
  244. node_modules/.bin/nodetouch.ps1
  245. node_modules/.bin/nopt
  246. node_modules/.bin/nopt.cmd
  247. node_modules/.bin/nopt.ps1
  248. node_modules/.bin/rc
  249. node_modules/.bin/rc.cmd
  250. node_modules/.bin/rc.ps1
  251. node_modules/.bin/semver
  252. node_modules/.bin/semver.cmd
  253. node_modules/.bin/semver.ps1
  254. node_modules/@sindresorhus/is/dist/index.d.ts
  255. node_modules/@sindresorhus/is/dist/index.js
  256. node_modules/@sindresorhus/is/dist/index.js.map
  257. node_modules/@sindresorhus/is/license
  258. node_modules/@sindresorhus/is/package.json
  259. node_modules/@sindresorhus/is/readme.md
  260. node_modules/@szmarczak/http-timer/LICENSE
  261. node_modules/@szmarczak/http-timer/README.md
  262. node_modules/@szmarczak/http-timer/package.json
  263. node_modules/@szmarczak/http-timer/source/index.js
  264. node_modules/@types/mongodb/LICENSE
  265. node_modules/@types/mongodb/README.md
  266. node_modules/@types/mongodb/package.json
  267. node_modules/@types/node/LICENSE
  268. node_modules/@types/node/README.md
  269. node_modules/@types/node/assert.d.ts
  270. node_modules/@types/node/async_hooks.d.ts
  271. node_modules/@types/node/buffer.d.ts
  272. node_modules/@types/node/child_process.d.ts
  273. node_modules/@types/node/cluster.d.ts
  274. node_modules/@types/node/console.d.ts
  275. node_modules/@types/node/constants.d.ts
  276. node_modules/@types/node/crypto.d.ts
  277. node_modules/@types/node/dgram.d.ts
  278. node_modules/@types/node/dns.d.ts
  279. node_modules/@types/node/domain.d.ts
  280. node_modules/@types/node/events.d.ts
  281. node_modules/@types/node/fs.d.ts
  282. node_modules/@types/node/fs/promises.d.ts
  283. node_modules/@types/node/globals.d.ts
  284. node_modules/@types/node/globals.global.d.ts
  285. node_modules/@types/node/http.d.ts
  286. node_modules/@types/node/http2.d.ts
  287. node_modules/@types/node/https.d.ts
  288. node_modules/@types/node/index.d.ts
  289. node_modules/@types/node/inspector.d.ts
  290. node_modules/@types/node/module.d.ts
  291. node_modules/@types/node/net.d.ts
  292. node_modules/@types/node/os.d.ts
  293. node_modules/@types/node/package.json
  294. node_modules/@types/node/path.d.ts
  295. node_modules/@types/node/perf_hooks.d.ts
  296. node_modules/@types/node/process.d.ts
  297. node_modules/@types/node/punycode.d.ts
  298. node_modules/@types/node/querystring.d.ts
  299. node_modules/@types/node/readline.d.ts
  300. node_modules/@types/node/repl.d.ts
  301. node_modules/@types/node/stream.d.ts
  302. node_modules/@types/node/string_decoder.d.ts
  303. node_modules/@types/node/timers.d.ts
  304. node_modules/@types/node/tls.d.ts
  305. node_modules/@types/node/trace_events.d.ts
  306. node_modules/@types/node/tty.d.ts
  307. node_modules/@types/node/url.d.ts
  308. node_modules/@types/node/util.d.ts
  309. node_modules/@types/node/v8.d.ts
  310. node_modules/@types/node/vm.d.ts
  311. node_modules/@types/node/wasi.d.ts
  312. node_modules/@types/node/worker_threads.d.ts
  313. node_modules/@types/node/zlib.d.ts
  314. node_modules/abbrev/LICENSE
  315. node_modules/abbrev/README.md
  316. node_modules/abbrev/abbrev.js
  317. node_modules/abbrev/package.json
  318. node_modules/accepts/HISTORY.md
  319. node_modules/accepts/LICENSE
  320. node_modules/accepts/README.md
  321. node_modules/accepts/index.js
  322. node_modules/accepts/package.json
  323. node_modules/acorn/CHANGELOG.md
  324. node_modules/acorn/LICENSE
  325. node_modules/acorn/README.md
  326. node_modules/acorn/bin/acorn
  327. node_modules/acorn/dist/acorn.d.ts
  328. node_modules/acorn/dist/acorn.js
  329. node_modules/acorn/dist/acorn.mjs
  330. node_modules/acorn/dist/acorn.mjs.d.ts
  331. node_modules/acorn/dist/bin.js
  332. node_modules/acorn/package.json
  333. node_modules/ansi-align/CHANGELOG.md
  334. node_modules/ansi-align/LICENSE
  335. node_modules/ansi-align/README.md
  336. node_modules/ansi-align/index.js
  337. node_modules/ansi-align/package.json
  338. node_modules/ansi-colors/LICENSE
  339. node_modules/ansi-colors/README.md
  340. node_modules/ansi-colors/index.js
  341. node_modules/ansi-colors/package.json
  342. node_modules/ansi-colors/symbols.js
  343. node_modules/ansi-colors/types/index.d.ts
  344. node_modules/ansi-regex/in
  345. Aborting
  346. hint: Could not execute the todo command
  347. hint:
  348. hint: pick d367d30a8eceecad805512ca45cf8f3feb92f218 First version
  349. hint:
  350. hint: It has been rescheduled; To edit the command before continuing, please
  351. hint: edit the todo list first:
  352. hint:
  353. hint: git rebase --edit-todo
  354. hint: git rebase --continue
  355. Could not apply d367d30... First version
  356. > git ls-files --stage -- D:\CODE\src\index.ts
  357. > git show --textconv :src/index.ts
  358. > git status -z -u
  359. > git check-ignore -v -z --stdin
  360. > git symbolic-ref --short HEAD
  361. fatal: ref HEAD is not a symbolic ref
  362. > git rev-parse HEAD
  363. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  364. > git remote --verbose
  365. > git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z d367d30a8eceecad805512ca45cf8f3feb92f218
  366. > git log --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z -n21 -- d:\CODE\src\index.ts
  367. > git check-ignore -v -z --stdin
  368. > git check-ignore -v -z --stdin
  369. > git check-ignore -v -z --stdin
  370. > git config --get commit.template
  371. > git check-ignore -v -z --stdin
  372. > git check-ignore -v -z --stdin
  373. > git check-ignore -v -z --stdin
  374. > git check-ignore -v -z --stdin
  375. > git log --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z -n21 -- d:\CODE\src\index.ts
  376. > git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z HEAD
  377. > git reset --soft HEAD~
  378. > git status -z -u
  379. > git check-ignore -v -z --stdin
  380. > git ls-files --stage -- D:\CODE\src\index.ts
  381. > git show --textconv :src/index.ts
  382. > git symbolic-ref --short HEAD
  383. fatal: ref HEAD is not a symbolic ref
  384. > git rev-parse HEAD
  385. > git for-each-ref --sort -committerdate --format %(refname) %(objectname) %(*objectname)
  386. > git remote --verbose
  387. > git show -s --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z d367d30a8eceecad805512ca45cf8f3feb92f218
  388. > git config --get commit.template
  389. > git log --format=%H%n%aN%n%aE%n%at%n%ct%n%P%n%B -z -n21 -- d:\CODE\src\index.ts
  390.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement