leanpub, to devops
@leanpub@mastodon.social avatar

The Unix Workbench by Sean Kross is free with a Leanpub Reader membership! Or you can buy it for $7.99! http://leanpub.com/unix

dxzdb, (edited ) to random
@dxzdb@mastodon.social avatar

git rant…

with Xcode 14 I could hit ⌘⌥C, immediately type a commit message, then hit ⌘-return to complete the commit. git and I were both happy doing commits quickly.

with Xcode 15 I apparently have to first mouse click into the spot for the commit message... then I have do another mouse click on the Commit button.

Is there a way to set this back to the previous behavior?

aeveltstra, to random
@aeveltstra@mastodon.social avatar

#git and other source control repo maintainers: please add a blurb to your readme that explains what it is your product is supposed to do. Please start with explaining what problem it solves.

zeroiee, to programming
@zeroiee@techhub.social avatar

A clean Git history is the key to successful teamwork and quick bug fixes. Errors can only be successfully tracked down if it is always possible to trace when and where code was changed by whom and for what reason.

🥴 However, in the rush of the battle, the changes that are packaged in a commit are sometimes not taken very seriously. Who has never experienced this? A change that is actually unrelated to the current work package has made it into the commit because the file has already been saved temporarily.

💡The solution: With an "interactive add" (git add -i), you can pack partial changes ("hunks") into a commit and specify line by line what should be included in the next commit.

:git: "Staging patches": https://git-scm.com/book/en/v2/Git-Tools-Interactive-Staging

skerit, to random
@skerit@elevenways.be avatar

Yikes, I thought I lost hours of work but it was just git-stashed under the totally wrong description. 🥵

#git #development

amoroso, to random
@amoroso@fosstodon.org avatar

I know, Git is a mess. But, since we're stuck with it, we may as well try to learn how it works with resources like this, which aims to lead to some form of Git enlightenment.

https://think-like-a-git.net

root42, to random
@root42@chaos.social avatar

Is there a way to resolve #git cherrypick conflicts purely on the command line, without using a merge tool by saying „use theirs“? Or „keep upper“?

civodul, to random
@civodul@toot.aquilenet.fr avatar

Finn Landweber wrote a pretty cool variant of the ‘guix git authenticate’ method:
https://codeberg.org/flandweber/git-verify

Highlights: Haskell instead of Scheme, JSON instead of sexps, SSH instead of OpenPGP, additional features such as per-file authorizations and unsigned merge commits.

👍

#Git

kernellogger, to linux
@kernellogger@fosstodon.org avatar

A question for experts on bisecting the :

Assume someone runs into a regression when updating from 6.1.90[1] to 6.6.30 that needs bisecting. What do you suggest:

  • Check manually which mainline release (e.g. 6.2, 6.3, ...) introduced the problem and afterwards bisect between that and the previous release.

  • Bisect straight between 6.1 and 6.6.30.

1/ I guess I would definitely go for…

[1] let's assume that 6.1 was fine for this scenario to keep things simpler

Crell, to programming
@Crell@phpc.social avatar
salcode,
@salcode@phpc.social avatar

@Crell I’m a fan of setting

git config --global pull.ff only

and continuing to use
git pull

Then if I hit the situation from the video where there are new commit(s) on the remote, #git stops the merge and displays a message. At that point I can decide how to handle it.

Long version at https://salferrarello.com/git-warning-pulling-without-specifying-how-to-reconcile-divergent-branches-is-discouraged/

tom, to Logseq German
@tom@swiss.social avatar

Dear #logseq and #obsodian users,
#git is not a backup system. Store your notes in a reposotory, if you must, but please configure a backup for your notes.

pawelgrzybek, to random
@pawelgrzybek@mastodon.social avatar

After using lazygit for a few days, I am completely sold. It makes working with git really enjoyable!

https://github.com/jesseduffield/lazygit

leanpub, to devops
@leanpub@mastodon.social avatar

Learn Git, Bash, and Terraform the Hard Way https://leanpub.com/b/learngitbashandterraformthehardway by Ian Miell is the featured bundle on the Leanpub homepage! https://leanpub.com #DevOps #SoftwareEngineering #ComputerProgramming #Git #Software #CloudComputing

leanpub, to random
@leanpub@mastodon.social avatar

Git Prodigy: Mastering Version Control with Git and GitHub https://leanpub.com/git-prodigy by Ebenezer Don is the featured book on the Leanpub homepage! https://leanpub.com

finestructure, to random
@finestructure@mastodon.social avatar

Folks who squash their merges, I’m curious why you are making that trade-off. I’m guessing the pro argument is a cleaner merge graph?

The big argument against it for me is that you lose granularity for git bisect. I've often been able to narrow down breakage (sometimes long past the merge) due to individual commits in the merge. If I'd merged in a giant blob all I'd have had to go by is that giant blob. (1/2)

Ric, to opensource
@Ric@awscommunity.social avatar

I've just published my starters guide to : https://gitlab.com/ric_harvey/git-guide it's free and licensed under the @creativecommons

robrich, to random
@robrich@hachyderm.io avatar

When you are gonna two branches after a long time

brianb, to random
@brianb@fosstodon.org avatar

question:

I have a branch that says it's up to date with the upstream (fork of a repo). I'm trying to contribute a patch, but my commit history in the PR has 26 commits from things that have already been merged rather than my changes from the current head.

Is there an acceptable way to clean up that history so my PR is clean?

notsle, to random
@notsle@kzoo.to avatar

Manager: Lets teach a non-developer office worker how to push code to git. "It's just clicking a few buttons. I've done it before. It's not that hard."

Me: :excuse_me:

nurkiewicz, to random
@nurkiewicz@fosstodon.org avatar

I run this command several times a day to keep my branch up-to-date with main:

git checkout $(git_main_branch) && \
git pull && \
git checkout - && \
git rebase -

6d03, to fediverse
@6d03@mathstodon.xyz avatar

federate decentralised repos through the .

twipped, to random
@twipped@twipped.social avatar

Ya love to see it.

opdavies, to random
@opdavies@mastodon.social avatar
civodul, to random
@civodul@toot.aquilenet.fr avatar

“Authenticate your checkouts!”
https://guix.gnu.org/en/blog/2024/authenticate-your-git-checkouts/

Yup! Time to consider doing it!

frankel, to random
@frankel@mastodon.top avatar
  • All
  • Subscribed
  • Moderated
  • Favorites
  • megavids
  • thenastyranch
  • rosin
  • GTA5RPClips
  • osvaldo12
  • love
  • Youngstown
  • slotface
  • khanakhh
  • everett
  • kavyap
  • mdbf
  • DreamBathrooms
  • ngwrru68w68
  • provamag3
  • magazineikmin
  • InstantRegret
  • normalnudes
  • tacticalgear
  • cubers
  • ethstaker
  • modclub
  • cisconetworking
  • Durango
  • anitta
  • Leos
  • tester
  • JUstTest
  • All magazines