bram85, to emacs

magit-find-file allows you to open a file at a certain revision, which could be a (relative) timestamp. Notation: HEAD@{3 days ago}.

Using these bits, I wrote a small #emacs command that displays a file at a certain moment, chosen with the built-in calendar.

(defun bram85-magit-find-file-as-of (datetime)  
 (interactive (list (org-read-date)))  
 (let ((rev (format "HEAD@{%s}" datetime)))  
 (magit-find-file rev (magit-read-file-from-rev rev "File: "))))  

#magit #git

hypolite, to random
$ git emote -v
😳
$

abcdw, to emacs
@abcdw@fosstodon.org avatar

Did you know that you can do a git log just for a small part of the file?

kernellogger, to random
@kernellogger@fosstodon.org avatar

v2.45.0 is out.

GitHub blog post with some highlights: https://github.blog/2024-04-29-highlights-from-git-2-45/

Announcement: https://lore.kernel.org/lkml/xmqq8r0ww0sj.fsf@gitster.g/

From the former:

'"[…] introduces preliminary support for a new reference storage backend called “reftable,” promising faster lookups, reads, and writes for repositories with any number of references. […]

Preliminary support for SHA-1 and SHA-256 interoperability

[…] git config learned a new option to help document your .gitconfig file […]"'

colindean, to random
@colindean@mastodon.social avatar

Are you skilled with ? Help me solve a seemingly nasty problem: https://stackoverflow.com/questions/78399515/how-best-to-merge-many-git-branches-appending-to-a-single-file

TL;DR I need to merge dozens of conflicting branches, each adding a few lines to the same file. Octopus merge method isn't working.

Taffer, to HowTo
@Taffer@mastodon.gamedev.place avatar

New post - Auto-deploy: Hugo and Codeberg CI https://taffer.ca/posts/2024/hugo-ci/

A description of how I’ve set up Codeberg’s CI to automatically build and deploy changes to my website.

joeyh, to random
@joeyh@hachyderm.io avatar

why does when pushing to a remote helper, first "list" the remote, then send the helper a "push", and only then notice if there's a non-fast-forward and claim the push has failed?

This seems to mean every remote helper has to detect non-fast-forward pushes and reject them, redundantly to git's own detection of the same thing.

(See for example git-remote-gcrypt documenting this as "A longstanding bug is that every git push effectively has a --force.")

InternetIsScary, to fediverse French
@InternetIsScary@mstdn.social avatar

The fediverse is amazing!

I can’t get over how cool it is to view my posts from any server. I’m definitely going to use activitypub for my social media I’m planning on making. I was going to use @Discourse , but considering it’s like where you are only able to self host and each instance of discourse can’t interconnect makes me kinda sad. But activitypub seems like the only way I feel happy in both ways.

@lemmy

leanpub, to ComputerScience
@leanpub@mastodon.social avatar

Git y GitHub desde cero by Brais Moure is free with a Leanpub Reader membership! Or you can buy it for $9.99! http://leanpub.com/git-github

abcdw, to random
@abcdw@fosstodon.org avatar

BTW, we went "the hard way" and picked the sourcehut todo service as a bug tracker and project management tool for RDE, Ares, Arei and neighboring projects.

It's very bare-bone, but we could implement cross-project milestones via labels, it's already have basic filtering and searching and integrates nicely with email and git.

Will be developing the rest of the functionality as we go. Probably via API or by upstreaming patches to sourcehut.

adamchainz, to random
@adamchainz@fosstodon.org avatar

I got another commit in 🥳

The book-driven development continues…

https://github.com/git/git/commit/89c6d6c74c61ae7013215b31b8612fd708899fbf

pocketvj, to linuxphones
@pocketvj@fosstodon.org avatar

news:
i fixed the wifi-sec hotspot creation bug, added a 'GSM Disable' entry and a 'Wifi Credentials' to show pw in text and qr-code of the connected wifi or hotspot.

and:

i decided to stop messing with sourcehut, send-email and upstream, for fuck sake, its so demotivating! to which email address? why did it not only send the last commit? where is it gone?
i prefer to use my time for features/fixes and to document them, not to messup pipelines of others....

welcomewerkstatt, to github German
@welcomewerkstatt@norden.social avatar

Kennt ihr ? Auch wenn ihr kein(e) Programmierer:in seid, dann seid ihr bestimmt schonmal auf , o.Ä. gestoßen. Auch als Designer:in, Maker:in, Texter:in oder einfach nur zum Projektmanagement spielen Git und die dazugehörigen Plattformen heute eine große Rolle. Wir erklären Git/GitHub/GitLab für Nicht-Programmierer in einem dreistündigen Workshop am Sonntag, den 19. Mai. https://www.welcome-werkstatt.de/veranstaltungen/git-fuer-nicht-programmierer

bagder, to random
@bagder@mastodon.social avatar

has proudly served as the HTTP(S) engine in for nineteen years now.

adamchainz, to django
@adamchainz@fosstodon.org avatar

✍️ New post on searching through Django’s Git log.

🔎 I often do this to find behaviour changes when upgrading client projects, at least for larger ones.

https://adamj.eu/tech/2024/04/24/django-pinpoint-upstream-git/

leanpub, to ComputerScience
@leanpub@mastodon.social avatar

Git y GitHub desde cero by Brais Moure is free with a Leanpub Reader membership! Or you can buy it for $9.99! http://leanpub.com/git-github

vwbusguy, to opensource
@vwbusguy@mastodon.online avatar

PSA: Do not submit "omnibus" pull requests to repos, especially without talking to the maintainer first. Keeping PRs generally focused to one particular problem or feature makes things far more manageable for reviewing, testing, and reverting/bug-fixing later on. I would always much rather have 10 smaller PRs focused one specific thing each than one massive unsolicited one with a bunch of scope creep.

Retcon, to macos
@Retcon@indieapps.space avatar

β25 is now available!

It's a big mix of small and medium-sized changes:
– A spiffy new welcome window, with recent repos
– You can now open a special example repository for testing things, that resets when you close its window. Go nuts!
– Check the global Git config using the sensibly-formatted table in Settings.
– Never forget about a rebase again: Retcon shows a big obvious badge in the Dock whenever you're paused for editing.

A macOS app settings window. The Git tab is selected. At the top of the window, a paragraph says: “Retcon supports the following Git configuration options. Use the command line to set them either globally, or for a specific repository.” Then, a table lists various Git configuration options, and their values. Some of the options are: Name, Email, Base ignores file, Difftool, Mergetool, Follow HTTP redirects
The macOS Dock. In the middle, there is the app icon for Retcon. It has a pause icon in a red badge. Surrounding it are the icons of: Nova, TextMate, DevRunner, and Xcode.
A screenshot of Retcon's update window. The release notes are: Retcon 1.0.0 β25 April 23rd, 2024 NEW Welcome window See recent repositories or quickly open a new one Open an example repository for trying out manipulations Settings Choose auto-update behavior See global values for supported Git settings A badge in the Dock now indicates if the app has paused for editing IMPROVED When a push is unable to fast-forward, force pushing is suggested Force push menu option is no longer hidden Orphaned stage lines now have a prominent striped background Retcon now shows a prompt for completing user details when relevant Retcon now automatically recovers from errors that occur while paused FIXED Couldn't fixup merge commits Empty commits are now automatically discarded Tab indents in file diffs were misaligned Scrolling through diffs could be stuttery Diff elements could be layout improperly Disable difftool actions when no tool is set Whitespace is now trimmed when entering new branch name In empty repositories, initial branch name was ignored

darthvader42, to random German
@darthvader42@sueden.social avatar
frankel, to random
@frankel@mastodon.top avatar

How to rebase against another branch overriding conflicts with your own branch changes

https://demisx.github.io/git/rebase/2015/07/02/git-rebase-keep-my-branch-changes.html

abcdw, to github
@abcdw@fosstodon.org avatar

The nice thing about sourcehut: API is exposed to me to the full extent and I can easily integrate things how I want.

https://man.sr.ht/lists.sr.ht/api.md
https://man.sr.ht/todo.sr.ht/api.md

hamoid, to random
@hamoid@genart.social avatar

I always find "Accept yours" vs "Accept theirs" confusing, when I'm the author of both... How to interpret yours and theirs? Local and remote?

joachim, to random
@joachim@drupal.community avatar

commands I need, part 1: git related: show me all the branches that contain the same issue number in their name as the current branch

adamchainz, to random
@adamchainz@fosstodon.org avatar

✍️ New post with a command for discovering the first tag containing a given commit.

$ git describe --contains <sha> | sed -E 's/[~^][0-9]*//g'

https://adamj.eu/tech/2024/04/22/git-show-first-containing-tag/

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