ProgrammerHumor
gitIsSoEasy
Discussion
git pull git status git add . git commit -m “upd” git push
git stash push git pull git stash pop
Very useful for cases where conflicts with local changes happen.
This way, it is easier to deal with merge conflicts for me
‘git commit -am “msg”’
Why many args when few possible
git gud -f scrub
It’s like when my last company couldn’t believe I didn’t use a gui to manage my commits. Just leave me and my commands alone man, I like them, they work, I know my lane 😭
Tbh sometimes I find the GUI more difficult to use than command lines
I come from a sysadmin background and I just am more comfortable with CLI than GUI for 90% of tasks
Same. It's also just drastically faster most times anyway.
No it's not. I use a combination of CLI and GUI and for most basic stuff GUI is faster. Maybe your repo is super basic and your branch names are 1 or 2 characters long (or you don't use branches at all) so it's quick to type stuff. There's no way I'm typing out a 20+ character branch name in one pass without any typos, faster than it takes me to make a couple of clicks.
.... you know you can tab complete branch names right?
I just use a vanilla bash terminal so no can do
does that work on windows cmd?
use powershell instead of the command prompt and it does
Unsure, I use zsh on osx and linux, and wsl a zsh if i need to do work on windows.
GitHub desktop is navigable by a toddler
I’ve used it for pull/commit/push/checkout (the basics).
How is it for the more advanced stuff?
VSCode and Github desktop make resolving merge conflicts pretty easy. I don't know how you would do this without the GUI offered by VScode at a minimum for comparing diffs.
Cherrypicking commits or going back in time is easy. Stash is easy. Not sure really what else you would need.
This one doesn't vim
What do you mean? Would using a different IDE better suited to a type of work I don't do create more complex use cases for git?
Google's interface is too complicated for you as well?
I’m asking what the user experience is like, not how to do it
Yeah- that's the problem. It's not usable for any mildly complex task.
Can you give me an example of a “complex task” scenario you encounter regularly? I work on a large team and we follow fairly strict rules about how/when to create branches and merge them. In several years I’ve never seen anything that the command line would be better suited for other than flexing on interns
Isnt flexing the main goal here? Everything else is secondary
Meanwhile if I remember in college everyone raised their eyebrows if you dared use emacs over vim. There’s a definitely a superiority the less you used guis there
Emacs is not a GUI app.
I used emacs in college out of spite but did come to the conclusion that it was better.
As a dev lead I empower my other members to find a way that works for them, but if they need my help with it then we're going to do it my way.
Git is very powerful but imo if you need to use those complex features regularly you’re doing something wrong. Command line is the best way to use git imo. Keep it simple. The GUIs are all way more complex than they need to be
If it's Gooey I'm pretty sure that means you didn't bake it long enough but I guess some people are into that
It doesn’t always have to be rock hard.
git good.
gitGud
Nah. Who else are we gonna git blame?
Git status in between every command cuz why not
Gotta do it otherwise the files will trick me
git reset --hard
git reset --hard origin/branch_name
For when you totally fucked up your local branch and want to redo
Yup. Or, as I call that situation, Tuesday.
Edit: nixed a trailing 's'.
rm -rf —no-preserve-root /
Then take a vacation.
git push --force | kms
What is kms
Kill myself
kms is not recognized as a cmdlet or function
sudo apt install kms
Ahh rookie mistake...first do sudo apt update
Kernel Mode Setting
But here it’s probably key management service for pasting keys
the software behind eve online's capsule system is much more straightforward than I could have imagined
You should always use --force-with-lease as a precaution against overwriting recent commits from others. It should be the default in my opinion.
Masters dont use branches then?
Can't imagine life without branches and rebase
Unironically. Trunk Based Development is hot right now. Requires a CI pipeline with strong automated testing and judicious use of feature toggles.
Personally I prefer, Github flow (not gitflow), short lived feature branches and PRs to main with strong automated testing and some use of feature toggles.
gitflow/mulitple long lived branches is where most people's problems with git arise.
Same here, make branch, do some changes, update it from main and make PR. In 6 years and 3 companies, Github desktop was enough for me except for a few times that I needed some complex commands.
In one company we had main and dev branches, feature branches are made from dev, hotfix made from main. After feature is done, it is merged in the dev and main is merged in dev. After release is ready, main is updated from the dev and release is made.
What you described is not a feature branch, but just a branch.
Feature branch is when you keep development, and testing on a single branch until all work is done and only them merged to master (with no further manual tests).
That's why people say feature branches are bad, but branches per se are ok.
I was in a team where we had task branches with PRs to story branches, and when these stories where done and approved, they where merged to master. We did not care about rebasing/ keeping the history clean, though.
What you call github flow we just refer to as a flavor of trunk based at my company, but I also prefer it. We do a branch for each jira card, so they usually don't live longer than a week.
Dev religions are hilarious.
gitflow/mulitple long lived branches is where most people's problems with git arise.
100% agree
Git add; git commit -m; git push works perfectly well with branches, what are you on about?
It drives me insane, but my current boss just works out of main.
A little simplistic IMO. I find myself doing a lot of git fetch upstream, git checkout main, git merge upstream/main, git log, and git rebase -i.
Or my favourite git feature that is usually easier to do with CLI: rebasing without checking out the parent branch:
$ git fetch origin main:main
$ git rebase main
I like my PHPStorm buttons <3
Except rebase cherrypick merge I didn't use anything from the long list in ny whole carrier
gst ga . gc -m "message"
Shocked to not see a single comment about git add -p
OP doesn't get git and needs to potray themselves as 145 IQ
pro tip: use
git commit -a -m
No need for an additional command(git add . )
Note that this will not add new untracked files.
my exact comment, had to scroll down so far to see this
`git commit -am . && git push`
Git is more difficult than JS tbh
Super ultra pro hacker tip: you can use git commit -am and skip git add . this way - which saves you time you can use later for resolving merge conflicts.
Sounds like you're working on a very simple system
far right only works if your whole team is on that level. otherwise you get stuck cleaning up the mess
git commit -a -m "" ?
Bruh. That empty commit message isn’t even human. Step it up. At least do “Some changes.” See that proper capitalization and punctuation?? GOML
I just click the plus button, the commit button, and the push button in VSCode
SVN is better. No hassle with branches and all that. The only way Git would be better is by force pushing all changes to the master branch.
You're fired
I... er... use my IDE's inbuilt git tools.
100% fine
That said, it will be better for your career to know how to use git CLI because there are so many times you will need it when working with servers.
But using your IDE or GUI is still absolutely fine and can even be better in some ways.
I always laugh at how true this meme is because it’s so true 😂 I did these exact mistakes
NGL. This is where your AI terminals come in pretty handy. I've been using the add, commit, push trio my entire career. When I need anything more complicated I used to look it up online (takes a few minutes) but now I just tell my terminal to do it and it does.
AI is for the weak
Refer to the meme. Strong jr dev energy you got there!
git merge to prod without PR 😂 so ez
palisiekurwa = !sh -c 'git add . && git commit -m \"palilo sie\" --no-gpg-sign --no-verify && git push --force && echo \"Ok, now RUN!\"'
https://github.com/jakubnabrdalik/gitkurwa/blob/master/configNSFW_PL
My 25 years of experience senior -> "just use fork dude, we're not in paleolithic anymore"
git add --all && git commit --message "$(fortune -n 72 -s)"
“TFS is easier”
“Noooo! You have to use git!”
“TFS is easier”
TFS
is easieruses up all your fucking disk space because it stores a full copy of all branches locally
I fucking hated cleaning up after TFS.
gcaa
gpsup
Alright but git commit amend no edit is goated
I map to this graph so hard haha. 15 years in and I’m on the far right of it. 7 years ago, I was the middle part 😂😂😂
Lol why should someone expire the ref log!? It's like cutting your own safety net.
I am so glad I get to use fork so I don't have to remember any of the advanced command syntax: https://git-fork.com/
”I love my git history linear” - Any Java developer
git is the Devil’s playground
I'd say the 2 most useful apart from your usual suspects are
Cherry pick and worktree
when things go bad
git reset main
git commit -am "let's try again"
git push origin --force
git add -A more than git add . for me.
$ git commit -a -m “WIP” 50 times a day
WIP too hard to type. Just do “…”.
Anyone who rebases should be cast into the sea.
Worst thing: rebase and force push when working on a branch that gonna be sooner or later squashed into master.
I created a bunch of comments on a PR and guy just rebased and forced pushes changed. All comments gone, because commit ID changed....
how does that quote goes ?
"90% of your userbase won't use 90% of the features on your application"
git has a ton of neat tools that help working with it,
but for most day-to-day activities, knowing how to commit code to a new branch and push to origin is more than enough
Damn, thanks for the --autosquash, time to stop prefixing all the "wip" commits with f!
git commit -a -m git push
I am Jedi so I use more force
Been coding since the 90s. I barely know any git terminal commands. It's only when I really mess up that I start begging Google StackOverflow GPT how to do the git stuff.
Git Kraken
I use sourcetree, does it count ?
What kind of unholy strategy uses all that?
git rebase is not that hard (until you are rebasing changes that contradict each other)
rebase with force push has many pitfalls. Dunno why people keep using it without just squashing stuff into master.
oh, you mean you guys don't delete the repo and push the code to a new one if there's ever a conflict?
I just rewrite, sometimes in a different language, if there’s a conflict.
Why make everything so complicated? The worst that I'll run into is a small merge conflict when pulling in changes and Ai have to do a git config pull.rebase false and manually check what I need to fix (this is why we have IDEs, people)
All these memes come down to one simple thing, really:
If it's simple, it's the first thing you learn
Then you learn about more complicated things to really take full control
Then you have to make your work accessible to others and not waste time, so you keep it as simple as when you first learned about it
Shout out to lazygit. It makes everything in the center much more user friendly!
Well if you can organize your code this well and code it in one go.
Didn't know there's a `replace` command.
I just use lazygit now. I forgot most git commands aside the main 3
So what does the guy on the left do when his branch is behind origin/main? What does he do when there is a merge conflict?
i used to use those console commands, but now i do everything in intellij idea
git commit -a -m “minor changes; git push”
This is very inaccurate.
The middle git commands are a nonsense sequence. Why would one be using both git merge and git cherry pick? Never use git merge if you can avoid it. Also you only have to mess with the reflog unless you fucked up bad. I guess he’s crying because he’s got no fucking clue what is going on.
As for the top end of the bell curve. No git’s not that easy. You need to rebase, cherry pick, and even do an occasional reset. All that guy is doing is best creating merge conflicts or worst case breaking the build.
Idk I just use the buttons in my IDE...
If I’m spending time fucking around with git commands, I’m not writing the code for the app I’m supporting. Git interactions should be simple, pull/push, branch, merge, stash, commit. They should also be easy. That’s why I actual prefer a GUI like SourceTree. I know I can do more complex things on the command line, and when I need to I do, but most of the time I just want to see what I’m working with and get back to writing code. But ultimately you do you.
I might be on the left, but I can’t be convinced git cherry-pick is a real command.
If only I could just teach 3 commands to someone and they never call me again...
This stuff only works if you work alone... I don't see the point of the meme. People who can't work with others are not on the right side.
Are y'all really manually typing all these git commands all the time? Every modern IDE has a git integration. Makes all of this pretty easy and quick. Even faster if you're using the keyboard shortcuts
Not all those commands, but yes. My IDE has git integration like you said but I prefer to do my gitting in the command line.
It could work fine for the basic flow, but I do enough non-standard stuff that git integrations feel stifling.
most git GUIs do not give you access to most of the commands in that list
yes, I type them every time. I know what I want to do, and I know what each option does, so I know what I need to type.
and I have aliases for the commands I use often. like sup for submodule update --init --recursive, because I work with submodules a lot.
At that point why not just make a bash/shell file at that point if you are writing the same 10+ commands over and over for every git usage
that's what git aliases are for.
But doesn’t a git alias only shorten a single command not a series of commands or was I unaware it can shorten a series of commands
by prepending ! you can start doing shell commands. so you can use && or take arguments.
an example alias i have: hotfix for !git add . && git commit --amend --no-edit
an example of taking arguments: dry-merge is !git merge --no-commit --no-ff $1 && git merge --abort &&:
usually tho, you only need to shorten 1 command. like i have sup for submodule --update --recursive
I’ve yet to use a bit gui that doesn’t have some glaring hole that requires stepping back to the cli. Even source tree.
as if typing commands is some laborious task lmao
Atuin
i use vs for that. yeah, i‘m the guy on the left
How to tell if your ide has prebuilt git integration. Did your project generate with a gitignore file? Perfect it definitely has git integration. I can’t think of a single ide that doesn’t generate a gitignore file either.
I like zsh with git plugin.
ga . gc -m gp
Most of them, yes. I like to know the commands so I can work even on another computer.
At least the usual pull, add, commit, push, rebase is something I use very often.
When it comes to cherry-picking, I as the brits.
Just joking, I use girk for that.
And for switching between local branches, I use the function of intelliJ, but I am quite sure that it is
git checkput [branch name]
git commit --amend
git push --force
Keeping the history clean by having only one commit 👌
Called 'update'
Even better: git commit --amend --no-edit
I used to alias this one, I called it git apend (or append? Idk)
That's
gcaneon my machine. Big fan of keeping branches clean, rewriting history is encouraged in our shop, as long as you're the only one working on your branch.We just squash merge, so it doesn't matters how messy your branch is.
i have a bunch of aliases on my git config, and `git amend` is the i used the most :)
i also have a `git nuke` command, which removes every branch but main/master/stage
and a `git prune` which lists the command i need to run to remove all merged branches from origin (still need to copy and paste them, because no fucking way do i trust git NOT to mess this up)
--amend --no-edit
Or of you're feeling fancy,
git push --force-with-leaseNo. That is for children. Big dogs dgaf about with-lease.
I do a bunch on my own branches when I've not yet set up a PR for review. I like to do granular commits and sometimes I miss a file that belongs to a commit I just made.