During a random school project.

Me: *Explains why team members idea is bad*

Team member: *Im going to do it like this anyways.*

Me: *add explaination of why idea is bad to git commit log.*

1 week later: some parts of the project dont work like they are suppost to.

Team member: *dude can you help me bla bla....(encounters issue i mentioned regarding his idea)*

Me: *no, i've already got too much on my plate. please, sort it out yourself....*

At the presentation

Teacher: *ask question about problem*

Team member: *tries to blame the problem on me....*

Me: *shows git commit log to teacher*

Me: *passing grade*

Team member: *failing grade*

Justice served.

With the other members of the team refusing to learn git and making changes directly to the staging server i get to write the commit messages for everyone.

Log:
UPDATE: *informative details *

UPDATE: mark made some changes

UPDATE: colin made the same changes as mark but different

UPDATE: andrew undid all colins updates to change one link and I had to add them back in, thank gawd I commit the night before

BUGFIX: andrew keeps changing the database host to localhost and uploading it without changing it back

UPDATE: we all hate andrew

Share your most useful terminal aliases and functions.

alias gs='git status'
alias gcm='git commit -m'
alias push='git push'
alias pull='git pull'
alias hosts='sudo nano /etc/hosts'
alias glog='git log --graph --oneline --decorate -n 10 --color'
alias mykey='cat ~/.ssh/id_rsa.pub | xclip -sel clip'

function mkcd () {
mkdir -p -- "$1" && cd -P -- "$1"
}

As well as one for each major project (lets say 1+ weeks of dev time) to immediately cd to it from anywhere. How about you guys?

Always looking to improve my terminal commands, so am curious what everyone else uses for shortcuts.

My typical development workflow:

$ ssh user@devserver
$ cd /appdir
$ git clone/pull
$ vim file
$ vim another file
$ tail -f /var/log/applog
$ vim file
$ git commit -am 'fixed the glitch'
$ git push origin dev
^D

a tale of daily frustration:

git fetch
*yup I'm up-to-date ...*
git add -p .
*hack in beautiful patch ...*
git status -bs
*correct branch, didn't forget any files ...*
git diff --cached
*yep, that is what I mean to commit ...*
git commit -m"[TKT-NUM] Meaningful commit message"
git log -p -1
*double-checking ... looks good ...*
git push remote tkt-num-etc

*for a brief moment feel accomplished ...*

*notice typo in commit message ...*

I don't have a funny image or punchline to sum this post up. But know that if you recognise this feeling, then I am your brother in git.

I was asked to look into a site I haven't actively developed since about 3-4 years. It should be a simple side-gig.
I was told this site has been actively developed by the person who came after me, and this person had a few other people help out as well.
The most daunting task in my head was to go through their changes and see why stuff is broken (I was told functionality had been removed, things were changed for the worse, etc etc).
I ssh into the machine and it works. For SOME reason I still have access, which is a good thing since there's literally nobody to ask for access at the moment.
I cd into the project, do a git remote get-url origin to see if they've changed the repo location. Doesn't work. There is no origin. It's "upstream" now. Ok, no biggie. git remote get-url upstream. Repo is still there. Good.
Just to check, see if there's anything untracked with git status. Nothing. Good.
What was the last thing that was worked on? git log --all --decorate --oneline --graph. Wait... Something about the commit message seems familiar. git log. .... This is *my* last commit message. The hell?
I open the repo in the browser, login with some credentials my browser had saved (again, good because I have no clue about the password). Repo hasn't gotten a commit since mine. That can't be right.
Check branches. Oh....Like a dozen new branches. Lots of commits with text that is really not helpful at all. Looks like they were trying to set up a pipeline and testing it out over and over again.
A lot of other changes including the deletion of a database config and schema changes. 0 tests. Doesn't seem like these changes were ever in production.
...
At least I don't have to rack my head trying to understand someone else's code but.... I might just have to throw everything that was done into the garbage. I'm not gonna be the one to push all these changes I don't know about to prod and see what breaks and what doesn't break
.
I feel bad for whoever worked on the codebase after me, because all their changes are now just a waste of time and space that will never be used.

Enough is enough! I can't do it anymore!

...

alias pm='python manage.py'
alias ga='git add .'
alias gc='git commit -a'
alias gi='git init && touch .gitignore && printf ".idea \n venv \n node_modules \n out \n *.iml \n *.log \n build \n target" > .gitignore'
alias gp='git push'
alias gps='git push --set-upstream origin master'
alias gr='git remote add origin'

...

Much better :D

So I am conducting an introductory seminar on git and GitHub for juniors and as per my knowledge I've drafted this outline, please add your inputs..

The seminar will be of 1 day only

1. Install and configure Git and Github

2. Digital Signature mapping

3. Git init

4. New Project with HTML

5. Configure remote (git remote add <origin> <url>) ends with .git

6. Git commit (git commit –m “Title” –m “commit message”)

7. Pushing git push (git remote push origin master)

8. Git commit –amend

9. Git pull (git pull origin master)

10. Git checkout (git checkout –b new_branch_name)

11. Do some changes

12. Git push new branch (git remote push origin new_branch_name)

13. Git switch branch (git checkout <name_of_existing_branch>)

14. Pull requests

15. Git log (git log –oneline –graph)

When you make a mistake and try to fix it, but you can't remember how to spell amend...

git commit --ammend
error: unknown command `amend'

git commit -ammend
[branch-name] mend

Huh?

git log
commit #
mend

Created a new commit with message 'mend'. Now to clean this all up and go get some sleep!

Someone else always have git log like this??
Or just me? 😂 ;-)

commit 6e71f545c3
Author: ShellAddicted
Date: Sat Sep 9 02undefined21 2017

it Works!!!

commit 6ac2c98bf
Author: ShellAddicted
Date: Sat Sep 9 01undefined47 2017

works more or less

commit 411b8e12
Author: ShellAddicted
Date: Sat Sep 9 00undefined00 2017

Initial state not working.

EDIT:
I just noticed that devrantron modified (bug) my rant (see the undefined in times)

GIT COMMMIT LOG VERSION 011
-------------------------
4cc7d0d Derp, asset redirection in dev mode
6b6e213 Lock S-foils in attack position
1e44549 I am even stupider than I thought
2f6bec9 You should have trusted me.
891851a To those I leave behind, good luck!
3367d77 Update .gitignore
46d6b0f Merging the merge
b12f6fe First Blood
0598e4f 8==========D
9151ff4 Finished fondling.
3a0ec1e ...
8358c20 c&p fail
bc1e834 magic, have no clue but it works
31bb17a I don't get paid enough for this shit.
21edb91 :(:(
7a71610 Stephen rebase plx?
2060661 Copy-paste to fix previous copy-paste
21ac5d2 Handled a particular error.
2dedd90 pam anderson is going to love me.
c3d4c83 omg what have I done?
d38bafd Herping the derp derp (silly scoping error)
e461773 Merge pull request #67 from Lazersmoke/fix-andys-shit Fix andys shit
1faf82b Is there an award for this?
1f6e3f3 Feed. You. Stuff. No time.
6f0097d I'm too old for this shit!
133179e I'm just a grunt. Don't blame me for this awful PoS.
d3e5202 harharhar
57d9a7c THE MEM TEST FUNCTION YOU ARE LOOKING FOR, IS HERE. SAY THANKS FOR THIS COMMIT MESSAGE

When you join a new project, look at the git log, and all the commits say 'initial-commit'... 😭

GIT LOG VERSION 110
---------------
a9c2934 I don't believe it
fb8d2e6 I am Root. We are Root.
6be9078 FINALLY FIXED THE FUCKING BUG IN THE CODE, DO NOT EVER EVER FUCK ME AGAIN YOU MARON
3d08a88 THIS IS THE FUCKING WORKING VERSION
013faed THIS IS NOT WHAT YOU ARE LOOKING FOR, GO TO A PREVIOUS COMMIT
af5d013 We'll figure it out on Monday
49e238b de-misunderestimating
a40351b happy monday _ bleh _
a5f345d Fixed unnecessary bug.
485a26a pay no attention to the man behind the curtain
c4fcbde s/import/include/

Me: Ok I've updated the docs, I'll open a PR with the changes

Maintainer: Looks great! Can you remove the changes to the package-lock.json? (I assume it got updated when you ran npm install to start the webserver)

Me: Ok sure, I'll update it soon

And this is where the troubles begin. The file was commited 2 commits ago, so I have to roll back to then. However, the remote repository has been updated since then, so I git fetch to keep up to date.

This makes the rollback a hell of a lot harder, so I run git log to see the history. I try a reset, but I went back to the wrong commit, and now a shit ton of files are out of sync.

I frantically google 'reset a git reset', and come across the reflog command. Running that fucks things up even worse, and now so much shit is out of sync that even git seems confused.

I try to fix the mess I've created, and so I git pull from my forked repo to get myself back to where I was. Git starts screaming at me about out of sync files, so I try to find a way to overwrite local changes from the origin.

And by this point, the only way to describe what the local repo looks like is a dumpster fire clusterfuck that was involved in a train wreck

I resolved the mess by just deleting the local copy and git cloning again from my fork.

I gotta learn how to use Git better

let me preface with the fact that I'm now known at my new job for being the resident cli hipster. I can't lay any claims to knowing if it's "better" but I like it, I don't care if you do or don't, it just works for me and my flow

so at my job, we generally squash all our commits into one commit and delete the source branch upon merging; i accidentally committed all my work to an old, already merged branch, so my boss tells me it would be more of a PITA with the weird references we would encounter by merging the branch again, rather than just cherry pick the commits into a new branch, which i'm like "eh, fine.".

HIM: "You want to share your screen so we can resolve this?"
ME: "k"
HIM: "Oh, you won't be able to do this in a terminal, you are going to have to load up a GUI of some sort"
ME: "lawlz, no you don't"
HIM: "i highly doubt you will be able to accomplish that, but if you wanna make an ass of yourself, i'll humor you"
ME: "yeah, watch this"

> git log > log.txt
> git checkout <new branch>
> git cherry-pick <copy-paste-full-commit-hash-here>
> git push

ME: "done"
HIM: "what? there's no way you did it that easily, where are all your other commits???"
ME: "i usually try to amend my commits since we squash them anyhow. it really helps in situations like this"
HIM: "well, you go girl"

roll that up in your fancy degree and smoke it, why don't ya?

GIT LOG Volume 111
--------------------
87f995b added some filthy stuff
741e8e6 For great justice.
5c2a5bd and so the crazy refactoring process sees the sunlight after some months in the dark!
8c9ce70 Pig
12d414b extra debug for stuff module
6d2a886 And a commit that I don't know the reason of...
5e4e815 a few bits tried to escape, but we caught them
b9ea370 WTF is this.
f1c6250 Another bug bites the dust
78e89ff Spinning up the hamster...
8358fec Whee.
3781dd7 This will definitely break in 2032 (TODO)
d11b24d Refactor factories, revisit visitors
53ebbd8 Who knows WTF?!
ba9813f really ignore ignored worsd
1ba7d4b RANDAL SUCKS
414a0c2 buenas those-things.

VS Code and SourceTree are two of the most used tool by me this year.

SourceTree helps me visualise the git commit history and branches more than git log can.

VS Code, on the other hand helps me with all the short code editing stuff and sometimes even helps when I don't want to open a full fledged IDE for the project. I have setup my own Icon themes for VS Code and even created watchers for files. Can't do this much on Webstorm so easily.

Spent like all week working on a feature set in a web app, finally got to a point where i thought it was functioning well, ran tests, tests passed.

I was exhausted but happy. All along i have been pushing to my GitLab server. I save my commits and even though exhausted, i am happy as i go to bed.

I wake up, run some errands and my business partner says, eh! Can i come see that new feature set you built, sure, i will be home soon.

I was at the barbershop, trying to look like a human being again. I get home boot my computer and i scream.....

Arrrrrrrrrrrrrrgh

I check GitLab, i check my Git Log and i start to sweat, i was in the air conditioner but it felt like someone turned the heat up.

Git log shows my last commit was 2 days ago, my app is at the state it was 2 days ago and i can't frigging find all i have built.

I need to show this to the client, have no idea what to do now, so stressful. My partner say, you know what, just watch a movie. You built it before, you will do it again.

This happened to him a while ago and i gave him similar advice, it felt wicked hearing it now.

Anyways, i have to build that ish all over again, i do know i wasn't dreaming about having built it. I asked my wife and she said, i did, i was always working. So confusing.

Anyone experienced this before, i have no idea how to find my code.

Help Meeeeeeeeeeeeeeeeeeeee