Git is by far the most popular software version control system today, and every software developer surely knows the basics of how to make a git commit. Given the popularity, it is surprising how many people don’t actually know the advanced commands. Mastering them might help you unlock a new level of productivity. Let’s dive in!

As aliases

alias g-log="git log --graph --format='format:%C(yellow)%h%C(reset) %s %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)'"
alias g-history='gitk --all &'
alias g-checkout='git checkout $(git branch --sort=-committerdate --no-merged | fzf)'
alias g-commit='git citool &'
alias g-amend='git citool --amend &'
alias g-rebase='git rebase --interactive --autosquash'
alias g-pull='git pull --verbose --rebase'
alias g-pushf='git push --verbose --force-with-lease'
alias g-status='git status --ignored'
alias g-clean='git clean -fdx && git reset --hard && git submodule foreach --recursive git clean -fdx && git submodule foreach --recursive git reset --hard'
  • AggressivelyPassive@feddit.de
    114·
    9 months ago

    That sounds like a solution in desperate need for a problem.

    All the “problems” you described boil down to “switching branches is evil”.

    • lysdexic@programming.devEnglish
      416·
      9 months ago

      That sounds like a solution in desperate need for a problem.

      It’s ok if you never did any professional software development work. Those who do have to go through these workflows on a daily basis. Some people don’t even understand why version control systems are used or useful, and that is perfectly ok. Those who do work have to understand how to use their tools, and those who don’t can go about their life without even bothering with this stuff.

      • AggressivelyPassive@feddit.de
        101·
        9 months ago

        And those who don’t immediately insult everyone at the slightest opposition are the ones who get things done.

        Seriously, your line of thinking is exactly the one of those weird colleagues nobody wants to work with, because they insist on their idiosyncratic bullshit.

        The “problem” you described above is - if it exists at all - extremely niche, and hardly anything anyone should solve with git, but with processes.

        Maybe you have a use for it in your workflow - but that might also mean your workflow might not be the best.

        • lysdexic@programming.devEnglish
          36·
          9 months ago

          And those who don’t immediately insult

          Pointing out someone’s claim that they don’t care about processes when it’s the critical aspect of any professional work is hardly what I’d call an insult.

          Just go ahead and say you don’t use a tool and thus you don’t feel the need to learn it. Claiming that a tool’s basic functionality is “a solution in search for a problem” is as good as announcing your obliviousness,and that you’re discussing stuff you hardly know anything about.

          • AggressivelyPassive@feddit.de
            41·
            9 months ago

            So, once again we are at a point in subs like this were the question is: Oblivious autist or arrogance bordering on being an asshole?

            Pointing out someone’s claim that they don’t care about processes when it’s the critical aspect of any professional work is hardly what I’d call an insult.

            See, you’re not claiming that processes are important, you’re claiming that your process is important and your interpretation of Git is the only one allowed, and that everyone who disagress with your opinion is an idiot.

            That is factually wrong, extremely close-minded, unproductive, and really really arrogant

            • lysdexic@programming.devEnglish
              13·
              9 months ago

              See, you’re not claiming that processes are important, you’re claiming that your process is important and

              No, I’m claiming that processes are important.

              It’s important that stumbling upon a tangentially related bug or even linting issue does not block your work, forces you to fork your work, nor forces you to work around it. It’s important that you can just post a small commit, continue with your work, and only handle that in the very end.

              It’s also important that you can work on your feature branch as you please, iterate on tests and fixes as you see fit, and leave cleanup commits to the very end so that your PR contributes a clean commit history instead of reflecting your iterations.

              It’s important that you can do any work you feel is important without having to constrain yourself to adapt your work to what you absolutely have to push your changes in a squraky clean state without iterations.

              It’s important that you can work on tasks as well as cleanup commits, and not be forced to push them all in a single PR because you are incapable of editing your local commit history.

              It’s not about my workflow. It’s about the happy path of a very mundane experience as a professional software developer, specially in a team which relies on a repository’s commit history to audit changes and pinpoint regressions.

              This is stuff anyone who works in professional teams can tell you right away. Yet, you talk about this if it was a completely alien concept to you. Why is that? Is everyone around you wrong and your limited superficial experience dictates the norm?

              Yet you talk about autism.

              • Modern_medicine_isnt@lemmy.world
                1·
                9 months ago

                I work in professional teams, have been for decades. Noticing an unrelated bug doesn’t block my workflow. I can fix it as part of the same pr, or just stash my changes and make a new branch for it. You sound like the people who demand everyone alphabetize thier import statements because they don’t want to use the ide’s search.
                It’s okay to have your own way and preferences, but they are yours, not everyone elses.