LQX Lemmy
  • Communities
  • Create Post
  • Create Community
  • heart
    Support Lemmy
  • search
    Search
  • Login
  • Sign Up
cm0002@lemmy.world to Programmer Humor@programming.dev · 2 years ago

git workflow

lemmy.ml

message-square
39
link
fedilink
558

git workflow

lemmy.ml

cm0002@lemmy.world to Programmer Humor@programming.dev · 2 years ago
message-square
39
link
fedilink
alert-triangle
You must log in or register to comment.
  • Scratch@sh.itjust.works
    link
    fedilink
    English
    arrow-up
    53
    ·
    2 years ago

    Be a man.

    ‘git commit -am “changes”’

    • Drew Belloc@programming.dev
      link
      fedilink
      arrow-up
      38
      ·
      2 years ago

      At this point just create a script or alias called “fuckthis” that does that and then push direct to main

      • Scratch@sh.itjust.works
        link
        fedilink
        English
        arrow-up
        35
        ·
        2 years ago

        PR reviews take the most time, eliminating those saved us loads of time.

        QA were also bogging us down, axed them too. Now we’re flying.

        The Social Security Infrastructure rebuild should be done in a matter of weeks! At least that’s what Copilot says.

        • Vittelius@feddit.org
          link
          fedilink
          arrow-up
          1
          ·
          2 years ago

          That’s how you get a Boing

      • jol@discuss.tchncs.de
        link
        fedilink
        arrow-up
        26
        ·
        2 years ago

        I have auto save on. A cron job running every minute with just git add . && git commit - m “wip”

        • Drew Belloc@programming.dev
          link
          fedilink
          arrow-up
          13
          ·
          2 years ago

        • magic_lobster_party@fedia.io
          link
          fedilink
          arrow-up
          12
          ·
          2 years ago

          && git push --force

      • DannyBoy@sh.itjust.works
        link
        fedilink
        English
        arrow-up
        19
        ·
        2 years ago

        Have the name of the alias be “gti” or “gut”

        • Drew Belloc@programming.dev
          link
          fedilink
          arrow-up
          11
          ·
          2 years ago

        • ѕєχυαℓ ρσℓутσρє@lemmy.sdf.org
          link
          fedilink
          arrow-up
          7
          ·
          edit-2
          2 years ago
          alias {gti,gut}='git commit -am "changes" && git push -f'
          
        • synae[he/him]@lemmy.sdf.org
          link
          fedilink
          English
          arrow-up
          5
          ·
          2 years ago

          I have about a dozen aliases of various mistypings of “git”. Somehow I still hit unaliased typo once in a while

    • Birch@sh.itjust.works
      link
      fedilink
      arrow-up
      5
      ·
      2 years ago

      git yolo

    • KindaABigDyl@programming.dev
      link
      fedilink
      arrow-up
      6
      arrow-down
      1
      ·
      2 years ago

      And any project worth their salt will reject it for two reasons:

      1. Unclear message/changes (potentially too many changes at once)
      2. Not signed
      • wise_pancake@lemmy.cadeleted by creator
        link
        fedilink
        arrow-up
        5
        ·
        2 years ago

        I’ve got signing auto enabled though

    • JiminaMann@lemmy.world
      link
      fedilink
      arrow-up
      2
      ·
      2 years ago

      Doesn’t work for me idk why, it’ll ignore the message, and i have to commit again before i can push

  • Limonene@lemmy.world
    link
    fedilink
    arrow-up
    24
    ·
    2 years ago

    I like git add because then you can do git diff --staged

    • Dave@lemmy.world
      link
      fedilink
      arrow-up
      7
      ·
      2 years ago

      Yes yes, combined with git add -P makes small, meaningful commits so much easier.

      • fossphi@lemm.ee
        link
        fedilink
        English
        arrow-up
        6
        ·
        2 years ago

        Check out magit!

        • Dave@lemmy.world
          link
          fedilink
          arrow-up
          2
          ·
          2 years ago

          Alas I sold my soul to VSCode a long time ago.

          Also, ew, emacs 😝

          • fossphi@lemm.ee
            link
            fedilink
            English
            arrow-up
            2
            ·
            2 years ago

            Oh come on, try it out! I know some people who use emacs only for magit. It really is that good.

            A few of them slowly became full on emacs users…

  • zero_spelled_with_an_ecks@programming.dev
    link
    fedilink
    arrow-up
    13
    ·
    2 years ago

    … What’s git merge look like?

    • zqwzzle@lemmy.ca
      link
      fedilink
      English
      arrow-up
      18
      ·
      2 years ago

      Tenerife incident.

      • childOfMagenta@lemm.ee
        link
        fedilink
        arrow-up
        2
        ·
        2 years ago

        … incident

  • synae[he/him]@lemmy.sdf.org
    link
    fedilink
    English
    arrow-up
    10
    ·
    2 years ago

    grow up, use “git add -p” and craft perfect artisanal commits

  • heavydust@sh.itjust.works
    link
    fedilink
    arrow-up
    11
    arrow-down
    1
    ·
    2 years ago

    Real 10x vibe developers use https://jj-vcs.github.io/jj/latest/, no need to add or commit!

    • Drew Belloc@programming.dev
      link
      fedilink
      arrow-up
      7
      ·
      2 years ago

      So is easier to push direct to prod? Hell yeah!

      • heavydust@sh.itjust.works
        link
        fedilink
        arrow-up
        4
        ·
        2 years ago

        With jj you’re always the prod whatever you do! Feel free to break that fucking CI.

        • Drew Belloc@programming.dev
          link
          fedilink
          arrow-up
          1
          ·
          2 years ago

          Gonna try it out non my next college project

          • heavydust@sh.itjust.works
            link
            fedilink
            arrow-up
            3
            ·
            2 years ago

            You may or may not be joking, but jujutsu is the first true git alternative that I’m actively trying on small projects at work. The command-line is great, and I can still interact with other devs without breaking stuff.

            Buuuuuuuut if you’re a CS student, don’t bother, it’s weird and you should focus on git which is used everywhere. You can get free GUI clients like Sublime Merge or SmartGit to ease the pain. I’ve been hating git since the beginning, but it’s the least worst SCM right now. Learn the command-line, but I have never done that since it’s infuriating, and that’s why I’ve been using GUIs since, holy shit, Wikipedia says 2005.

            • Drew Belloc@programming.dev
              link
              fedilink
              arrow-up
              2
              ·
              2 years ago

              Is just half a joke, i do like to try it out a lot of different things, be whatever it may be, so i’m totally finding a project to use this, and also i don’t really like to use a GUI for git simce most of my workflow happens in a terminal, and even tho i do like how git works i am open to try something new and see if it’s better for me or not

              • heavydust@sh.itjust.works
                link
                fedilink
                arrow-up
                2
                ·
                2 years ago

                Try Mercurial too. Both projects started at the same time but git won. Mercurial is equivalent but its interesting.

                • Drew Belloc@programming.dev
                  link
                  fedilink
                  arrow-up
                  1
                  ·
                  2 years ago

                  Sure, thanks for the recomendation

  • Comtief@lemm.ee
    link
    fedilink
    arrow-up
    7
    ·
    2 years ago

    i’m sure there are much better tools available, but i’m just used to git gui where rescan, commit and push all are in order.

  • NigelFrobisher@aussie.zone
    link
    fedilink
    arrow-up
    5
    ·
    2 years ago

    Every bloody time, though this case the people not on the Ryanair flight may be the lucky ones. If only git was the most unnecessarily arcane thing devs have to/choose to work with.

  • callmepk@lemmy.worlddeleted by creator
    link
    fedilink
    arrow-up
    4
    ·
    2 years ago

    I specifically have a oh-shit alias for this kind of stuff lol: https://code.wedotstud.io/patrick/dotfiles/src/commit/c2f93629fe27d1747ceb22b4d6442840d109aa99/.gitconfig#L28

  • tatterdemalion@programming.dev
    link
    fedilink
    arrow-up
    4
    ·
    2 years ago

    Use Jujutsu jj and you won’t have this problem

  • lobut@lemmy.ca
    link
    fedilink
    arrow-up
    4
    ·
    2 years ago

    lazygit is pretty cool too.

  • thirteene@lemmy.world
    link
    fedilink
    arrow-up
    3
    ·
    2 years ago

    I set this up for seamless commits:

    function gao() {
         git add .
         git commit -a -m "$*"
         git push origin `git rev-parse --abbrev-ref HEAD`
     }
    

    Usage: gao fixing a typo

  • Anti-Antidote@lemmy.zip
    link
    fedilink
    arrow-up
    2
    ·
    2 years ago

    Jujutsu time 😁

Programmer Humor@programming.dev

programmer_humor@programming.dev

Subscribe from Remote Instance

Create a post
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programmer_humor@programming.dev

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

  • Keep content in english
  • No advertisements
  • Posts must be related to programming or programmer topics
    • If the mod doesn’t find it funny, you’re banned. Ha-ha!.. For real: do not use the community for “statements”. There are other places for such content. Keep it chill and funny.
Visibility: Public
globe

This community can be federated to other instances and be posted/commented in by their users.

  • 2.05K users / day
  • 3.79K users / week
  • 7.13K users / month
  • 16K users / 6 months
  • 1 local subscriber
  • 33.6K subscribers
  • 2.14K Posts
  • 65.6K Comments
  • Modlog
  • mods:
  • adr1an@programming.dev
  • Feyter@programming.dev
  • BurningTurtle@programming.dev
  • Pierre-Yves Lapersonne@programming.dev
  • BE: 0.19.20
  • Modlog
  • Legal
  • Instances
  • Docs
  • Code
  • join-lemmy.org