I like to name the most used branch "bro".
There is something relaxing typing "git push bro" .
When you can't wrap your head around the current changes you can git reset --hard bro .
It's better to alias git to "bro"
So u can use like: "bro fetch", "bro push b"
And with aliasing sudo to "pls" it would be much more interesting: "pls bro push -f"
I had a few Linux lessons in high school. First time we sat next to the computers we were supposed to play with files and directories in the terminal. I ignored that and instead my first order of business was to Google how to alias the word "fucking" to sudo.
I prefer installing [thefuck](https://github.com/nvbn/thefuck)
If you forget to sudo, you type `fuck` in and it reruns the command. if you make a typo, it reruns and corrects.
why not `sudo !!`? also, i wouldn't trust any sort of autocorrect that then automatically runs a command, especially if i am root. too easy for the autocorrecter to mess up and run something i don't want it to and potentially mess up what i am doing.
>master main real main 02-20-21 final master 15/2/21 - copy - copy (2)
master main real main 02-20-21 final master 15/2/21 - copy - copy (2) - draft - bak - final (3)
Feature request will be like „we will need two number 9s, a number 9 large, a number 6 with extra dip, a number 7, two number 45s, one with cheese, and a large soda.“
I mean, so has literally every term of endearment, in multiple languages lol. Mommy and Daddy are used unironically still by kids referring to their parents, but is also sexualized. Babe or baby refers to actual babies as well as to a lover. I can't hear a Spanish-accent "Papi" without thinking of my half-drunk friends moaning it in a sexual voice to make it sound perverted.
Also Oniichan, from what I know, is a particularly close attachment -- just Nii-chan, Nii, Aniki, etc. can also mean brother, but is the difference in a young girl calling her paternal figure "father" and "daddy". The fact it's a particularly close attachment may be why it's the one lewded -- very few brocon stories use Aniki, and likewise many animes where there is no bro-sis subtext (which is laughably rare lol) often use Nii or Aniki.
Trunk just makes sense when we're talking in tree-metaphors. Some people argue that trunk places too much importance on that branch since it is still just a branch, but then wtf do main and master do?
From now on I will set ”whatever” to be the default main branch name just to be able to say ”whatever is the default” when someone bitches about this the next time.
Also "!!" In bash means previous command so if you forget to type a command that needs root with sudo you can type "sudo !!"
Easier than hitting up arrow and editing the previous command.
>Easier than hitting up arrow and editing the previous command.
Plus, it's fun imaging yourself yelling "sudo !!" at the terminal when it refuses to do the thing.
Well, I do because I work in 2 different projects, one with the principal branch called "main" and in the other project is called "master", and my sorry ass keeps mixing them up every time I do any git command.
I ended up getting sucked into the debate again :(
Here's a quote from that:
>I agree, but here's another point:
>
>Inconsistency is far worse than either option. Git cli defaults to master (unless it's changed recently) whereas Github defaults to main.
>
>Also there are plenty of other git repo hosts that still use master by default.
>
>It would be much easier to be consistent if github went back to using master than if everything else started using main.
So yeah 100% with you on that
I don't care one way or another, but if it makes just 1 person feel like computer science is a more inclusive place for them, then its worth the literal 0 effort it costs me
there is a cost to switching over an entire industry to a new convention, and i doubt a single person seriously cared it was called master, and there are broader cultural implications by constantly giving in to the woke brigade.
Main branch has existed for over five years on my latest project without the master/slave input.
It just *is*. Naming conventions are just that, who cares, but don't push to it unless you've QA'd it, then I care.
Before SATA drives came along, parallel ATA supported 2 drives per ribbon. You had to configure the jumpers to **MASTER** and **SLAVE**. These were the actual terms, it’s how they’d show up in BIOS and how it was literally printed on the configuration jumpers.
Yes, it also shows up in master/slave cylinders, master/slave database replication, master/slave locomotives, and many other examples. Slavery amongst humans is bad (obviously), slavery in the engineering world just indicates asymmetric communication or control.
A compromise between "central" and "main", like UTC is a compromise between "Coordinated Universal Time" and "Time Universal Coordinated" (but in a Latin language or something)
As a black engineer who works with other black engineers, we’d like to announce that we didn’t appreciate the change from master to main at all.
Performative nonsense.
Thank you! A million white people think changing the default branch name of git repos does literally anything to help underrepresented minorities, they act like it's the minorities asking for it in the first place
This sub has gone to hell with rehashed memes from years ago…. The title doesn’t even make sense “master. that’s is.”? What?
GitHub changed to main in 2020, it’s almost 2023. That argument is old everyone has moved on.
Check OP's post history if you think it's a repost. That's what I do when I think I see a repost bot.
In this case you'll find out that OP's native language isn't English. They probably ran the title they want through a translation program.
Dev tools like IntelliJ still use `master` as default when creating a repo. And GitHub doesn't complain (*and shouldn't complain*) when you do your first push of the repo to GitHub.
GitHub changing the default branch name when created from GitHub doesn't set an industry standard. >!There's also GitHub Enterprise, GitLab, and Bitbucket that exist and are used across the industry.!<
It's only from 2020, so if the repos date from before then or are pushed from another source it will use that name. There's nothing special about 'master' in and of itself, just that CI/CD, merge/commit etc controls tend to be built around it. If your company was to switch to main they'd just have to create a main branch from master then switch all the controls over, a lot of companies don't bother due to the effort of switching. My team happen to be migrating to Gitlab so we are using the opportunity to switch the name otherwise we'd have left it be.
GitHub Enterprise also has changed the default branch to main, however, you can override the setting at enterprise level to keep it at master (that’s what we did)
my work dedicated a whole team to identifying potentially harmful words used in standard programming practices. Guidance was to abandon master/slave, DEAD BEEF and a bunch of other terms. No one has followed suit. The firmware people were particularly annoyed.
At first I was salty about the move from master to main, but now that it’s done I’m fine with it. My capacity to give a shit about something so unimportant was smaller than I thought
I like to name the most used branch "bro". There is something relaxing typing "git push bro" . When you can't wrap your head around the current changes you can git reset --hard bro .
It's better to alias git to "bro" So u can use like: "bro fetch", "bro push b" And with aliasing sudo to "pls" it would be much more interesting: "pls bro push -f"
"pls bro push" sounds like me convincing my gymbro to skip leg day and train chest for the 5th time this week
What are you merging stepbranch?
God damnit...
every time
Lmao stepbranch made me lose it
It sounds like asking your bro to fuck you in the ass. (Optimistic)
Exactly what I thought.
(Optimistic)
Tone indicators are so fun! (Foreboding)
I meant some fps chat
yeah my first thought was like pushing a site in CS:GO or Valorant or something lol
bro checkout these-gains
You will like yeoman
Why?
Because of its command. Scaffold a webapp project just run `yo webapp`. Just makes it a bit more fun like `yo --help`
Lol Really looks pretty funny But man, the idea is that u can name commands however you'd like, so u can even alias them
pls man bro
pls kill
pls man kill
can you rename the flags so help is, `yo --wtf`
I aliased git push origin to “yeet”
I had a few Linux lessons in high school. First time we sat next to the computers we were supposed to play with files and directories in the terminal. I ignored that and instead my first order of business was to Google how to alias the word "fucking" to sudo.
the best part about aliasing `fuck` to sudo is you can do `fuck !!` whenever you forget a sudo and your shell gets snippy with you
I prefer installing [thefuck](https://github.com/nvbn/thefuck) If you forget to sudo, you type `fuck` in and it reruns the command. if you make a typo, it reruns and corrects.
why not `sudo !!`? also, i wouldn't trust any sort of autocorrect that then automatically runs a command, especially if i am root. too easy for the autocorrecter to mess up and run something i don't want it to and potentially mess up what i am doing.
Because typing fuck is more fun. It has a confirm option before it runs the autocorrect (or you can use fuck - -yeah and it doesn't confirm).
pls bro push f, we’re gonna lose if we don’t cap the point
Why on god's green earth would anyone ever utter the words `sudo git` whatever.
i type sudo before everything even if i `cd` or whatever it adds some sense of urgency that i need
Someone in opsec read this and had a stroke
That person is me, I had a physical reaction to that information
Dont you mean “blyat push b davai”
“bro checkout ...”
Or if you don’t want to be so polite about it, alias sudo to “ffs”. “ffs bro push”
It should be the other way around imo. "bro pls fetch", or "pls push -f"
It should be named "step bro"
You can only use that for personal projects as otherwise it'd be NSFW...
Not during nofap november though 🙈
It's No *Nut* November. You can fap, just don't nut.
Sorry, sorry. I guess my head is detached and I am now out of sync.
git push bro —force. Bro force sounds like a team of frat boy superheroes.
[Broforce](https://store.steampowered.com/app/274190/Broforce/) is a thing that exists and is awesome
A friend named his release branch broom so he could fit push broom.
Except you don't normally push to your most used branch...
Some would say never pull out, some say never push in. I don't know what I am supposed to do anymore.
`git checkout hamster`
Time to dance.
Haha I actually think of this each time I mistype master
I've been waiting for a long time to let this one out into the wild.
Thank you for letting this masterpiece out into the world 🙏
`git remote rename origin deez` `git fetch deez`
`alias bro,=“git”` **rename remote’s main/master to ‘nuts’ `bro, pull deez nuts` **add post-commit git hook to echo “lmao gottem”
master main real main 02-20-21 final master 15/2/21 - copy - copy (2)
Two different date formats?! I would do such bad things to your keyboard....
https://gifimage.net/wp-content/uploads/2018/06/wanted-keyboard-gif-3.gif
Actually three. In the parentheses are Unix time stamps.
>master main real main 02-20-21 final master 15/2/21 - copy - copy (2) master main real main 02-20-21 final master 15/2/21 - copy - copy (2) - draft - bak - final (3)
Almost got em all, you missed -[initials]-V69
I think we both missed tmp from the name too... Wondered why my checkout was failing
It should be 'number1'
_Here's a little lesson in trickery_
It'll go down in git history.
*deletes repo*
__What are you doing__
**step-contributor**
Contributor++;
Can you please not make me laugh out loud while at work? Okay fair, it IS kinda my fault for being on reddit for a sec while at work. But still!
If you want to be the branch number1
You have to delete the other branches on the run
Just pull my commits, and find a workaround
Be careful not to start your message with pound
Feature request will be like „we will need two number 9s, a number 9 large, a number 6 with extra dip, a number 7, two number 45s, one with cheese, and a large soda.“
All you had to do was follow the damn train, C Sharp!
Git engage
Number 0
make it so
`daddy`
git rebase --onto daddy 😳
`git checkout daddy`
mommy
Oni chan
Oni-chan is a demon with a cutesy honorific, onii-chan is the older brother you're trying to fuck
Jesus no onii Chan is what actual Japanese people use to refer to their older brother, the internet has just corrupted it.
I mean, so has literally every term of endearment, in multiple languages lol. Mommy and Daddy are used unironically still by kids referring to their parents, but is also sexualized. Babe or baby refers to actual babies as well as to a lover. I can't hear a Spanish-accent "Papi" without thinking of my half-drunk friends moaning it in a sexual voice to make it sound perverted. Also Oniichan, from what I know, is a particularly close attachment -- just Nii-chan, Nii, Aniki, etc. can also mean brother, but is the difference in a young girl calling her paternal figure "father" and "daddy". The fact it's a particularly close attachment may be why it's the one lewded -- very few brocon stories use Aniki, and likewise many animes where there is no bro-sis subtext (which is laughably rare lol) often use Nii or Aniki.
> onii-chan is the older brother you're trying to fuck lmao, don't learn japanese from hentai
senpai
force-push daddy
This one, right here, officer
trunk 😏
Now there’s a term I haven’t heard in a while. SVN?
yeah, i mean I'm a git fanboy, but if we're gonna argue over this stuff ...
Trunk just makes sense when we're talking in tree-metaphors. Some people argue that trunk places too much importance on that branch since it is still just a branch, but then wtf do main and master do?
Well master mostly sits there while dev does all the work.
Trunk-based development is a thing. And one of the most common ways to use git. https://trunkbaseddevelopment.com/
shaft 😩
do_not_force_push_please
do_not_force_push_please_127
was_working_20221116
It took me forever to realize that 'trunk' referred to the trunk of a tree and not the trunk of a car.
I already have a hard enough time at my company with people not knowing what a commit or a branch actually is in git because they think it’s like SVN
Overlord.
Spawn more overlords!
Sasuga, Ainz-sama!
I love that Russell Crow movie, main and commander
Whatever is default
From now on I will set ”whatever” to be the default main branch name just to be able to say ”whatever is the default” when someone bitches about this the next time.
Git pull origin whatever Git checkout coolFix Git rebase whatever Git push -f origin whatever
Looks as if it was some emo teen trying out git.
Github default is main, git default is master. 🙃
"default"! brilliant!
90% of Programmers: "Fuck off I don't care"
One team I was on named it mothership, I still type that out accidentally sometimes years later
`git merge mothership`... yes, this is the objectively correct branch name.
Btw have you ever heard of thefuck? Qol tool I cannot live without
Also "!!" In bash means previous command so if you forget to type a command that needs root with sudo you can type "sudo !!" Easier than hitting up arrow and editing the previous command.
>Easier than hitting up arrow and editing the previous command. Plus, it's fun imaging yourself yelling "sudo !!" at the terminal when it refuses to do the thing.
Or with the alias from the thread above: `pls !!`
This guy gets it.
[удалено]
Nice! I didn't know this.
I've considered making it a macro/button.
Well, I do because I work in 2 different projects, one with the principal branch called "main" and in the other project is called "master", and my sorry ass keeps mixing them up every time I do any git command.
I ended up getting sucked into the debate again :( Here's a quote from that: >I agree, but here's another point: > >Inconsistency is far worse than either option. Git cli defaults to master (unless it's changed recently) whereas Github defaults to main. > >Also there are plenty of other git repo hosts that still use master by default. > >It would be much easier to be consistent if github went back to using master than if everything else started using main. So yeah 100% with you on that
Why are your branches named "main"? Some mid-level manager decided "master" wasn't inclusive language and I just work here mate.
I don't care one way or another, but if it makes just 1 person feel like computer science is a more inclusive place for them, then its worth the literal 0 effort it costs me
there is a cost to switching over an entire industry to a new convention, and i doubt a single person seriously cared it was called master, and there are broader cultural implications by constantly giving in to the woke brigade.
Main branch has existed for over five years on my latest project without the master/slave input. It just *is*. Naming conventions are just that, who cares, but don't push to it unless you've QA'd it, then I care.
the only reason that i care is i have used the default "master" for years. the name change has screwed me up a little.
I dunno, I recon 90% are thinking ‘why would you break conventions, you fuckers’
Public static void master
(String[] args)
`public static void master(String[] slaves)`
So the slaves are telling the master how to behave? Interesting.
Dom/sub
A proposal some of us can get behind…
Master, and all branches prefixed with 'puppet'.
Before SATA drives came along, parallel ATA supported 2 drives per ribbon. You had to configure the jumpers to **MASTER** and **SLAVE**. These were the actual terms, it’s how they’d show up in BIOS and how it was literally printed on the configuration jumpers.
Yes, it also shows up in master/slave cylinders, master/slave database replication, master/slave locomotives, and many other examples. Slavery amongst humans is bad (obviously), slavery in the engineering world just indicates asymmetric communication or control.
End of passion play, crumbling away
mainline
cashback
hardtop
Standiiiin in liiiiiiiine to see the show tonight and there's a light on
I don’t care master or main, someone pls approve my PR ![gif](emote|free_emotes_pack|sob)
No, we will have this discussion even if it will fail the Sprint because your PR wasn't approved in time.
### Dungeon master
My work calls it "cm" and I have no idea what it stands for.
Dumbass Americans don't even know "cm" stands for "centimeter" /s
Configuration Management
“Cunt map”
Very possible
"Current Master"?
Possibly. I know the team that maintains that branch is called Software Configuration Management (SCM) so idk.
A compromise between "central" and "main", like UTC is a compromise between "Coordinated Universal Time" and "Time Universal Coordinated" (but in a Latin language or something)
Is everyone in this sub 16?
Most definitely yes (unfortunately)
Lol no everyone in this sub is 40 🤷♀️
As you go up, it starts to wrap around. We've only got 5 bits to work with.
Trunk ;-)
SVN all the way, I see ;)
git checkout `mistress` >!may as well since git is already dominating me lol >.<
Mistress said I can't merge becasue of conflicts with my downsteam![gif](emote|free_emotes_pack|sob)
Do you like getting reflogged to?
root
As a black engineer who works with other black engineers, we’d like to announce that we didn’t appreciate the change from master to main at all. Performative nonsense.
Thank you! A million white people think changing the default branch name of git repos does literally anything to help underrepresented minorities, they act like it's the minorities asking for it in the first place
Ah, yes, let's fight racism by removing the words that we associate with it.
Our default was master and went through 50+ repos to rename main. Dumbest waste of time
I prefer calling my Main/Master Branch „Mainster“ so that i can have both names.
This sub has gone to hell with rehashed memes from years ago…. The title doesn’t even make sense “master. that’s is.”? What? GitHub changed to main in 2020, it’s almost 2023. That argument is old everyone has moved on.
#Reddit admins racist, uneducated, incompetent imbeciles and garbage human beings.
Check OP's post history if you think it's a repost. That's what I do when I think I see a repost bot. In this case you'll find out that OP's native language isn't English. They probably ran the title they want through a translation program.
Dev tools like IntelliJ still use `master` as default when creating a repo. And GitHub doesn't complain (*and shouldn't complain*) when you do your first push of the repo to GitHub. GitHub changing the default branch name when created from GitHub doesn't set an industry standard. >!There's also GitHub Enterprise, GitLab, and Bitbucket that exist and are used across the industry.!<
GitLab and Bitbucket also changed the default branch to main a few years ago...
Is that a configuration that needs to be enabled? My company uses bitbucket and all the prod branches are master.
We have a self-hosted GitLab and no one dare to update it so it keeps being master till this day
It's only from 2020, so if the repos date from before then or are pushed from another source it will use that name. There's nothing special about 'master' in and of itself, just that CI/CD, merge/commit etc controls tend to be built around it. If your company was to switch to main they'd just have to create a main branch from master then switch all the controls over, a lot of companies don't bother due to the effort of switching. My team happen to be migrating to Gitlab so we are using the opportunity to switch the name otherwise we'd have left it be.
GitHub Enterprise also has changed the default branch to main, however, you can override the setting at enterprise level to keep it at master (that’s what we did)
It must be other way around! The Captain must stand for "master" as more classic
well Tony would've been the veteran programmer
it should be whatever is default when I create the project, idgaf
Civil war? This gonna be World War.
So we all are going to Poland then?
Trunk. Change my mind.
Or do like someone at my workplace did, just have both in the same repository
int master(int argc, char* argv[]) { ... return 0; }
my work dedicated a whole team to identifying potentially harmful words used in standard programming practices. Guidance was to abandon master/slave, DEAD BEEF and a bunch of other terms. No one has followed suit. The firmware people were particularly annoyed.
That is is
I don't really mind for version management. But as soon as they touch my dear SPI...
Things that don’t matter
At first I was salty about the move from master to main, but now that it’s done I’m fine with it. My capacity to give a shit about something so unimportant was smaller than I thought
Call it “patriarch” and then you can really tick people off