git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[ANNOUNCE] update-base-branch: Track arbitrary external content in Git branch

From
JKJohan Kiviniemi <johan@kiviniemi.name>
Date
Jul 21, 2009, 14:29 UTC
Message-ID
<bd9320b40907210729q32b3e031r54cc7474d1b5685d@mail.gmail.com>

To reduce the pain with the merging of my config changes (for various software) with upstream’s new defaults, I came up with a small program to track the default config files in a Git branch.

With things set up, the update and the merge become a matter of:

% ./update-defaults (or whatever you’ll call your script) % git merge defaults (or whatever you’ll call the defaults branch)

The program is generic, of course – I’ve already found other uses for it[1].

The README: http://github.com/ion1/update-base-branch#readme

How I use the program in real life – examples of what the update-defaults script mentioned above could look like: http://github.com/ion1/update-base-branch/tree/master/examples#browser

Release tarball: http://johan.kiviniemi.name/software/update-base-branch/

A demonstration: using the program to update the user config for the Awesome window manager: http://www.youtube.com/watch?v=RQ3CqJ4jM90&fmt=18

[1] If there is no public VCS repository for a piece of software and you want to maintain/send patches, use update-base-branch to track the contents of the latest released tarball and merge that branch with your ‘master’.

-- 
Jοhan Kiviniemi
Message 1 of 1 in “[ANNOUNCE] update-base-branch: Track arbitrary external content in Git branch”
  1. Johan KiviniemiJul 21, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.