Are you over 18 and want to see adult content?
More Annotations
A complete backup of tealeafnation.com
Are you over 18 and want to see adult content?
A complete backup of ceskyinternet.cz
Are you over 18 and want to see adult content?
A complete backup of danalesliegoldstein.com
Are you over 18 and want to see adult content?
A complete backup of oliversportsgt.com
Are you over 18 and want to see adult content?
A complete backup of guttersupply.com
Are you over 18 and want to see adult content?
A complete backup of clearviewplumbing.ca
Are you over 18 and want to see adult content?
Favourite Annotations
A complete backup of subscribemediumamanda-de.com
Are you over 18 and want to see adult content?
A complete backup of barisicinakademisyenler.net
Are you over 18 and want to see adult content?
A complete backup of spanishprofe.com
Are you over 18 and want to see adult content?
A complete backup of synthanatomy.com
Are you over 18 and want to see adult content?
Text
TAI, GIT!?!
Tai, gw gak sengaja commit sesuatu di master yang harusnya di branch baru! Catatan: Ini gak guna kalau lo udah push commit-an lo ke public/shared branch, dan kalau lo udah pernah commit yang lain-lain, lo mungkin perlu git reset HEAD@ {jumlah-commitan-lo} daripada HEAD~. Sedih yang tak berujung. OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh shit, πρέπει να αναιρέσω τις αλλαγές μου σε ένα αρχείο! # βρες το hash για ένα commit πριν την αλλαγή του αρχείου git log # χρησιμοποίησε τα arrow keys για OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! Git ist schwer: Fehler zu machen ist leicht, und herauszufinden wie man sie wieder behebt ist am Anfang fast unmöglich. Auch die Dokumentation hilft oft nicht weiter, weil man erst die passenden Begriffe kennen muss, mit denen man sein Problem lösen kann. Deswegen folgen hier einige Situationen, in denen ich mich schon befunden habe, und wie ich da wieder rausgekommen bin SHIT POMMES FRITES, GIT!?! Shit pommes frites, jag råkade committa till fel branch! # ångra senaste commit, men lämna kvar ändringarna git reset HEAD~ --soft git stash # flytta till rätt branch git checkout namnet-av-rätt-branch git stash pop git add . # eller lägg till individuella filer git commit -m "ditt meddelande här" # nu finns dina ändringar på rätt अरे यार्, GIT!?!TRANSLATE THIS PAGE अरे यार्, नयाँ ब्रान्च (branch) मा कमिट (commit) गर्नु पर्थ्यो, मैले झुकिएर मास्टर (master) ब्रान्च मा गरे! # अहिले को स्थितिमा नै बसेर नयाँ ब्रान्च अरे यार, GIT!?!TRANSLATE THIS PAGE अरे यार, Git!?! Git मुश्किल है: गलतियाँ आसानी से हो सकती हैं, और यह पता लगाना कि तुम्हारी गलतियों को कैसे ठीक किया जाए काफी माथा पच्ची वाला काम है। Git के स्कोप में O JEBO TE, GIT!?!TRANSLATE THIS PAGE O jebo te, Git!?! Git je težak: lako je zajebati stvari, a skontati kako da popraviš greške je jebeno nemoguće. Git dokumentacija ima problem šta je starije koka ili jaje gdje ne možeš da nađeš kako da se izvučeš iz problema, osim ako već znaš za stvar koja ti treba kako bi rešio svoj problem. Dakle evo nekih loših situacija u koje sam zapao i kako sam se na kraju izvukao iz DO HAJZLU, GIT!?!TRANSLATE THIS PAGE Do hajzlu, Git!?! Git je složitý: něco posrat je jednoduché, ale přijít na to, jak z toho ven někdy téměř nemožné. Hledat něco v dokumentaci Gitu jde těžko, pokud tedy už nevíš název té věci, kterou hledáš. Tady jsou některé situace, kdo kterých jsem se dostal a také řešení, která vedla k OH SHIT, GIT!?!DERAHAT, GITIDNE Oh shit, I need to undo a commit from like 5 commits ago! # find the commit you need to undo git log # use the arrow keys to scroll up and down in history # once you've found your commit, save the hash git revert # git will create a new commit that undoes that commit # follow prompts to edit the commit message # or just save and OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! 用好 Git 很难: 很容易就犯错了,然后想自己弥补犯下的错,简直太难了。查阅 Git 文档简直就像是个 “鸡生蛋 蛋生鸡” 的问题,你得知道你要的是啥 ,但如果我知道的话,我还他妈查个毛文档啊! 所以接下来我会分享一些我遇到过的抓狂的经历,然后用 白话 来说说我是如何解决的。TAI, GIT!?!
Tai, gw gak sengaja commit sesuatu di master yang harusnya di branch baru! Catatan: Ini gak guna kalau lo udah push commit-an lo ke public/shared branch, dan kalau lo udah pernah commit yang lain-lain, lo mungkin perlu git reset HEAD@ {jumlah-commitan-lo} daripada HEAD~. Sedih yang tak berujung. OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh shit, πρέπει να αναιρέσω τις αλλαγές μου σε ένα αρχείο! # βρες το hash για ένα commit πριν την αλλαγή του αρχείου git log # χρησιμοποίησε τα arrow keys για OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! Git ist schwer: Fehler zu machen ist leicht, und herauszufinden wie man sie wieder behebt ist am Anfang fast unmöglich. Auch die Dokumentation hilft oft nicht weiter, weil man erst die passenden Begriffe kennen muss, mit denen man sein Problem lösen kann. Deswegen folgen hier einige Situationen, in denen ich mich schon befunden habe, und wie ich da wieder rausgekommen bin SHIT POMMES FRITES, GIT!?! Shit pommes frites, jag råkade committa till fel branch! # ångra senaste commit, men lämna kvar ändringarna git reset HEAD~ --soft git stash # flytta till rätt branch git checkout namnet-av-rätt-branch git stash pop git add . # eller lägg till individuella filer git commit -m "ditt meddelande här" # nu finns dina ändringar på rätt अरे यार्, GIT!?!TRANSLATE THIS PAGE अरे यार्, नयाँ ब्रान्च (branch) मा कमिट (commit) गर्नु पर्थ्यो, मैले झुकिएर मास्टर (master) ब्रान्च मा गरे! # अहिले को स्थितिमा नै बसेर नयाँ ब्रान्च अरे यार, GIT!?!TRANSLATE THIS PAGE अरे यार, Git!?! Git मुश्किल है: गलतियाँ आसानी से हो सकती हैं, और यह पता लगाना कि तुम्हारी गलतियों को कैसे ठीक किया जाए काफी माथा पच्ची वाला काम है। Git के स्कोप में O JEBO TE, GIT!?!TRANSLATE THIS PAGE O jebo te, Git!?! Git je težak: lako je zajebati stvari, a skontati kako da popraviš greške je jebeno nemoguće. Git dokumentacija ima problem šta je starije koka ili jaje gdje ne možeš da nađeš kako da se izvučeš iz problema, osim ako već znaš za stvar koja ti treba kako bi rešio svoj problem. Dakle evo nekih loših situacija u koje sam zapao i kako sam se na kraju izvukao iz DO HAJZLU, GIT!?!TRANSLATE THIS PAGE Do hajzlu, Git!?! Git je složitý: něco posrat je jednoduché, ale přijít na to, jak z toho ven někdy téměř nemožné. Hledat něco v dokumentaci Gitu jde těžko, pokud tedy už nevíš název té věci, kterou hledáš. Tady jsou některé situace, kdo kterých jsem se dostal a také řešení, která vedla kET MERDE, GIT!?!
Et merde, Git!?! Git est compliqué : c'est facile de tout foirer et foutrement impossible de réparer ses erreurs. La documentation de Git tient du problème de l'œuf et de la poule : pour y chercher comment vous sortir du bordel il faut déjà connaître le truc qu'il faut savoir pour résoudre votre problème.. Voici donc quelques exemples de mauvais pas où je me suis fourré, et comment OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! 用好 Git 很难: 很容易就犯错了,然后想自己弥补犯下的错,简直太难了。查阅 Git 文档简直就像是个 “鸡生蛋 蛋生鸡” 的问题,你得知道你要的是啥 ,但如果我知道的话,我还他妈查个毛文档啊! 所以接下来我会分享一些我遇到过的抓狂的经历,然后用 白话 来说说我是如何解决的。 OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! גיט זה קשה: קל מאוד לפשל, ולהבין איך לתקן את הטעויות שלך זה פאקינג בלתי אפשרי. התיעוד של גיט סובל מבעיית הביצה והתרנגולת בה אתה לא יכול לחפש כיצד להוציא את עצמך מהבלאגן, אלאאם כן אתה
अरे यार्, GIT!?!TRANSLATE THIS PAGE अरे यार्, नयाँ ब्रान्च (branch) मा कमिट (commit) गर्नु पर्थ्यो, मैले झुकिएर मास्टर (master) ब्रान्च मा गरे! # अहिले को स्थितिमा नै बसेर नयाँ ब्रान्च GIT ҚОТАҚБАС!!! Git қотақбас!!! Git қиын: жобаны бір пәсте жоғалтып алу оңай, және оны қалай қайтаруға болатыны түсініксіз. Git документациясы - қақпан: дұрыс шешімді табу үшін бәрін бастапқы қалпынаәкелетін
OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! Git is moeilik: om 'n fokkop te maak is maklikik, maar om uit te vind hoe om dit reg te maak is fokken onmoontlik. Git dokumentasie het 'n probleem waar jy nie kan soek hoe om jouself uit die gemors te kry nie, behalwe as jy klaar die naam ken wat van die ding wat jy oor moet weet om die probleem te kan oplos. So hier is 'n paar slegte situasies waarin ek myself bevind het en OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! گیت سخته: امکان اشتباه زیاده، و فهمیدن اینکه چطوری میشه درستش کرد غیرممکنه. راهنمای گیت مشکل معروف مرغ و تخم مرغ رو داره وقتی که نمیدونی چی جستجو کنی که خودتو از منجلاب نجات بدی،مگه
SHIT POMMES FRITES, GIT!?! Shit pommes frites, jag råkade committa till fel branch! # ångra senaste commit, men lämna kvar ändringarna git reset HEAD~ --soft git stash # flytta till rätt branch git checkout namnet-av-rätt-branch git stash pop git add . # eller lägg till individuella filer git commit -m "ditt meddelande här" # nu finns dina ändringar på rättGODVER, GIT!?!
Godver, Git!?! Git is moeilijk: fouten maken is verrot simpel en uitzoeken hoe je die kut fouten moet herstellen is godsonmogelijk. Git documentatie werkt niet, want omdat je verdomme niet weet hoe je uit die ellende moet komen, weet je ook niet waar je naar moet zoeken om die klerefouten op te lossen. Daarom staan hier wat problemen waar ik tegenaan gelopen ben en hoe ik me hier uiteindelijk OH SHIT, GIT!?!TRANSLATE THIS PAGE Oh Shit, Git!?! Git ist schwer: Fehler zu machen ist leicht, und herauszufinden wie man sie wieder behebt ist am Anfang fast unmöglich. Auch die Dokumentation hilft oft nicht weiter, weil man erst die passenden Begriffe kennen muss, mit denen man sein Problem lösen kann. Deswegen folgen hier einige Situationen, in denen ich mich schon befunden habe, und wie ich da wieder rausgekommen bin Hi there! You can get this same content without swears at dangitgit.com View in other languages* afrikaans (af)
* বাংলা (bn)* česky (cs)
* deutsch (de)
* español (es)
* persian (fa)
* suomi (fi)
* français (fr)
* ελληνικά (gr)* עברית (he)
* हिन्दी (hi) * bahasa indonesia (id)* italiano (it)
* 日本語 (ja)
* kazakh (kk)
* 한국어 (ko)
* नेपाली (ne)* nederlands (nl)
* polski (pl)
* português brasileiro (pt_BR)* romana (ro)
* русский (ru)* serbia (sr)
* swedish (sv)
* ภาษาไทย (th)* Türkçe (tr)
* українська (ua)* 中文 (zh)
OH SHIT, GIT!?!
Grow
sales with Mailchimp's marketing smarts. Try it now.ads
via Carbon
Git is hard: screwing up is easy, and figuring out how to fix your mistakes is fucking impossible. Git documentation has this chicken and egg problem where you can't search for how to get yourself out of a mess, _unless you already know the name of the thing you need to know about_ in order to fix your problem. So here are some bad situations I've gotten myself into, and how I eventually got myself out of them _in plain english_. OH SHIT, I DID SOMETHING TERRIBLY WRONG, PLEASE TELL ME GIT HAS A MAGIC TIME MACHINE!?!git reflog
# you will see a list of every thing you've # done in git, across all branches! # each one has an index HEAD@{index} # find the one before you broke everything git reset HEAD@{index} # magic time machine You can use this to get back stuff you accidentally deleted, or just to remove some stuff you tried that broke the repo, or to recover after a bad merge, or just to go back to a time when things actually worked. I use reflog A LOT. Mega hat tip to the many many many many many people who suggested adding it! OH SHIT, I COMMITTED AND IMMEDIATELY REALIZED I NEED TO MAKE ONE SMALLCHANGE!
# make your change git add . # or add individual files git commit --amend --no-edit # now your last commit contains that change! # WARNING: never amend public commits This usually happens to me if I commit, then run tests/linters... and FML, I didn't put a space after an equals sign. You could also make the change as a new commit and then do rebase -i in order to squash them both together, but this is about a million times faster. _Warning: You should never amend commits that have been pushed up to a public/shared branch! Only amend commits that only exist in your local copy or you're gonna have a bad time._ OH SHIT, I NEED TO CHANGE THE MESSAGE ON MY LAST COMMIT! git commit --amend # follow prompts to change the commit message Stupid commit message formatting requirements. OH SHIT, I ACCIDENTALLY COMMITTED SOMETHING TO MASTER THAT SHOULD HAVE BEEN ON A BRAND NEW BRANCH! # create a new branch from the current state of master git branch some-new-branch-name # remove the last commit from the master branch git reset HEAD~ --hard git checkout some-new-branch-name # your commit lives in this branch now :) Note: this doesn't work if you've already pushed the commit to a public/shared branch, and if you tried other things first, you might need to git reset HEAD@{number-of-commits-back} instead of HEAD~. Infinite sadness. Also, many many many people suggested an awesome way to make this shorter that I didn't know myself. Thank you all! OH SHIT, I ACCIDENTALLY COMMITTED TO THE WRONG BRANCH! # undo the last commit, but leave the changes available git reset HEAD~ --softgit stash
# move to the correct branch git checkout name-of-the-correct-branchgit stash pop
git add . # or add individual files git commit -m "your message here"; # now your changes are on the correct branch A lot of people have suggested using cherry-pick for this situation too, so take your pick on whatever one makes the most sense to you! git checkout name-of-the-correct-branch # grab the last commit to master git cherry-pick master # delete it from master git checkout master git reset HEAD~ --hard OH SHIT, I TRIED TO RUN A DIFF BUT NOTHING HAPPENED?! If you know that you made changes to files, but diff is empty, you probably add-ed your files to staging and you need to use a specialflag.
git diff --staged
File under ¯\_(ツ)_/¯ (yes, I know this is a feature, not a bug, but it's fucking baffling and non-obvious the first time it happens toyou!)
OH SHIT, I NEED TO UNDO A COMMIT FROM LIKE 5 COMMITS AGO! # find the commit you need to undogit log
# use the arrow keys to scroll up and down in history # once you've found your commit, save the hashgit revert
# git will create a new commit that undoes that commit # follow prompts to edit the commit message # or just save and commit Turns out you don't have to track down and copy-paste the old file contents into the existing file in order to undo changes! If you committed a bug, you can undo the commit all in one go with revert. You can also revert a single file instead of a full commit! But of course, in true git fashion, it's a completely different set offucking commands...
OH SHIT, I NEED TO UNDO MY CHANGES TO A FILE! # find a hash for a commit before the file was changedgit log
# use the arrow keys to scroll up and down in history # once you've found your commit, save the hash git checkout -- path/to/file # the old version of the file will be in your index git commit -m "Wow, you don't have to copy-paste to undo" When I finally figured this out it was HUGE. HUGE. H-U-G-E. But seriously though, on what fucking planet does checkout -- make sense as the best way to undo a file? :shakes-fist-at-linus-torvalds: FUCK THIS NOISE, I GIVE UP.cd ..
sudo rm -r fucking-git-repo-dir git clone https://some.github.url/fucking-git-repo-dir.git cd fucking-git-repo-dir Thanks to Eric V. for this one. All complaints about the use of sudo in this joke can be directed to him. For real though, if your branch is sooo borked that you need to reset the state of your repo to be the same as the remote repo in a "git-approved" way, try this, but beware these are destructive and unrecoverable actions! # get the lastest state of origingit fetch origin
git checkout master git reset --hard origin/master # delete untracked files and directories git clean -d --force # repeat checkout/reset/clean for each borked branch *Disclaimer: This site is not intended to be an exhaustive reference. And yes, there are other ways to do these same things with more theoretical purity or whatever, but I've come to these steps through trial and error and lots of swearing and table flipping, and I had this crazy idea to share them with a healthy dose of levity and profanity. Take it or leave it as you will! Many thanks to everyone who has volunteered to translate the site into new languages, you rock! Michael Botha (af ) · Khaja Md Sher E Alam (bn ) · Eduard Tomek (cs ) · Moritz Stückler (de ) · Franco Fantini (es ) · Hamid Moheb (fa ) · Senja Jarva(fi ) · Michel
(fr ) · Alex Tzimas(gr ) · Elad Leev
(he ) · Aryan Sarkar (hi ) · Ricky Gultom(id ) · fedemcmac
(it ) · Meiko Hori
(ja ) · Zhunisali Shanabek (kk ) · Gyeongjae Choi (ko ) · Rahul Dahal (ne ) · Martijn ten Heuvel (nl ) · Łukasz Wójcik (pl ) · Davi Alexandre (pt_BR ) · Catalina Focsa (ro ) · Daniil Golubev (ru ) · Nemanja Vasić (sr ) · Björn Söderqvist (sv ) · Kitt Tientanopajai(th ) · Taha Paksu
(tr ) · Andriy Sultanov (ua ) · Tao Jiayuan (zh ) . With additional help from Allie Jones · Artem VorotnikovDavid Fyffe
Frank Taillandier
Iain Murray
Lucas Larson
Myrzabek Azil
If you'd like to help add a translation into your language, submit aPR on GitHub
What's your Oh shit, git moment? Share it with me! @ohshitgit@ksylor
2016-2021 Katie Sylor-MillerDetails
Copyright © 2024 ArchiveBay.com. All rights reserved. Terms of Use | Privacy Policy | DMCA | 2021 | Feedback | Advertising | RSS 2.0