[git-users] The spam level is untenable, so I'm leaving, bye bye!

to leave. /M, signing out -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ "There was a point to this story, but it has temporarily escaped the chronicler's mind." — This line perhaps

[git-users] So much spam!

Can someone please make sure that the users spamming the list are banned? Is there some way of making sure they can't join the list to begin with? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http

Re: [git-users] Updates were rejected because the tip of your current branch is behind its remote counterpart.

out, _then_ testing without a merge would have prevented you from undoing merged changes ¯\_(ツ)_/¯ /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ `This must be Thursday,' said Arthur

Re: [git-users] Updates were rejected because the tip of your current branch is behind its remote counterpart.

can do - invest in ways to test locally, then you don't have to push at all. - invest in ways to test on your 'feature-branch', then you don't have to merge into 'staging' (and push the merge) /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magt

Re: [git-users] fork versus branch a personal repo for different versions of a manuscript?

ing but am willing to learn. For this use case I wouldn't bother with branches. Once you've arrived at a core version, then I'd suggest you simply create a folder for each customised version, copy the core in and then customise as needed. /M -- Magnus Therning OpenPGP: 0x9

Re: [git-users] fork versus branch a personal repo for different versions of a manuscript?

e in and then customise as needed. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ "He expanded his chest to make it totally clear that here was the sort of man you only dared to cross if y

Re: [git-users] .gitconfig (global) Linux ok, MacOS ignores some setting

config --global init.defaultBranch main Sorry for the noise, I try to upgrade git on the mac That is a difference but not that big, I would think, but as it seems I am mistaken. I'm happy to help :) /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org

Re: [git-users] .gitconfig (global) Linux ok, MacOS ignores some setting

the branch that is created per default is master. What is wrong here? Some case is wrong for MacOS? Do you have the same version of git on both systems? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http

Re: [git-users] Troubleshooting specific version of git installation

quite understand what you mean. It might help if you mentioned what command you used to "run tar ball from the git archive". /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/

Re: [git-users] Advice on workflows?

can start modify the workflow as you go along. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ "Zaphod grinned two manic grins, sauntered over to the bar and bought

Re: [git-users] Re: clean/smudge filter with age

t ../age-0/foo.secret 6046316bf834dbdf83a5be74be6fd2ac foo.secret 6046316bf834dbdf83a5be74be6fd2ac ../age-0/foo.secret - This isn't what I expected. What's wrong with my setup, what am I missing? /M [1]: https://github.com/FiloSottile/age -- Magnus Therning OpenPGP: 0x927912051716CE39

[git-users] clean/smudge filter with age

cret - This isn't what I expected. What's wrong with my setup, what am I missing? /M [1]: https://github.com/FiloSottile/age -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology

Re: [git-users] DCSV in 2007: Linus Thorvalds talk

to use it over SSH (something I believe all of the services you mention at least used to do under the hood). /M [1]: https://git-scm.com/docs/git-daemon -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http

Re: [git-users] Corrupted production repo - safe to delete and re-clone?

` piped into `rsync`. Basically anything that helps me not fall for the "oh, but it's so simple, I'll do it only this once" :) /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ I

Re: [git-users] bash echo ' and ( problem

ut problem remains. See "string quotes" at https://devhints.io/bash /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ Only put off until tomorrow what you are willing to die

Re: [git-users] Driving a little train (dot/point/circle) across the branches.

skybuck2000 writes: On Saturday, January 15, 2022 at 5:29:59 PM UTC+1 Magnus Therning wrote: Maybe https://jonas.github.io/tig/ fits the bill. Anyway I watch this video today, it seems somewhat familiar/similiar, Is this guy also using TIG ? Or is just the greenness is similiar ? Hmmm

Re: [git-users] Driving a little train (dot/point/circle) across the branches.

skybuck2000 writes: On Saturday, January 15, 2022 at 5:29:59 PM UTC+1 Magnus Therning wrote: Maybe https://jonas.github.io/tig/ fits the bill. ... I am too tired to install yet another git prompt thingy... but tomorrow I will probably give this TIG a try... What does TIG stand

Re: [git-users] Driving a little train (dot/point/circle) across the branches.

idea and you on git mailing list, mail this forward to them ! Cause for some reason I can't and not yet gonna subscribe, see ya ! =D) Bye, Skybuck. -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning

[git-users] Re: Removing refs after adding a negative refspec

Magnus Therning writes: At work each project has a few branches related to our gitops setup that mostly are in the way in the daily work. I add negative refspecs to `.git/config` to tell git to ignore them. However, this doesn't remove them from the output of my favourite log command[1

[git-users] Removing refs after adding a negative refspec

hear about it too. /M [1]: `git log --graph --decorate --pretty=lola --abbrev-commit --branches --remotes` -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ Action is the foundational key to a

Re: [git-users] Re: Feature Request: Recognizing which code belongs together and in what file and file segment it belongs.

, and 3. your branch is 3 years behind the upstream master branch. I can't help but feel a little sorry for you. Maybe that https://github.com/mhagger/git-imerge can help you out of the predicament you've put yourself in. /M -- Magnus Therning OpenPGP: 0x927912051716CE

Re: [git-users] cannot commit or pull

it allows me to not "self-censor"; I'll make any changes I want in my workspace, even ones that aren't related to the issue I'm working on at the moment, because I know that I can split the changes into multiple commits later on. Staging is the mechanism that enables that. /M

Re: [git-users] cannot commit or pull

git add -p`) One big difference in `git`, at least IIRC from when I still used mercurial, is the concept of _staging_. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/ Only put off until t

Re: [git-users] cannot commit or pull

you'd find it very worthwhile investing time in learning the differences between git and mercurial. Using mercurial you've learnt a lot of things that are general to distributed version control, but you can't transfer _all_ your mercurial knowledge to git. /M -- Magnu

Re: [git-users] diff between local and remote file

"sharan@gmail.com" writes: Thanks, Magnus. I have pulled (git pull) before executing the command I showed. On your suggestion (git diff origin/master -- README) Do I need to specify the path to README or I need to be in the directory where README? Yes, in general y

Re: [git-users] diff between local and remote file

othing has worked so far ... First things first, you have fetch the upstream changes git fetch origin after that it's possible to compare the file in your work area to the file on origin/master like this: git diff origin/master -- README /M -- Magnus Therning

Re: [git-users] Build errors when building git on MacOS 11 (x86-64) and for M1 macs

/exe/bundle:37:in `top (required)' | /opt/angry-omnibus-toolchain/bin/bundle:23:in `load' | /opt/angry-omnibus-toolchain/bin/bundle:23:in `main' |  Error: The command exited with status 1 -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe

Re: [git-users] How can I contact the author of VSCode extension "Bracket Pair Colorizer 2"?

conflict. I would be VERY surprised if you reach the author of a VSCode extension on this list! This list is for _git users_, not for GitHub or its users, and not for VSCode extension authors. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@

Re: [git-users] git gc error

n* No parts of git are written in java. A java.lang.NullPointerException can't happen there. On the other hand, Gerrit is written in java, so I guess the exception comes from there. Bye, Tassilo -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.tech

Re: [git-users] trivial question for beginner

tions on how to do this. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org twitter: magthe http://magnus.therning.org/ Every act of creation is first an act of destruction. — Pablo Picasso -- You received this message because you ar

Re: [git-users] Substitute Keywords in file during commit

> How do I tell if git is running the subvalues script? Have you tried writing something to stdout in the script? If not you can temporarily write to another file to do some printf-debugging. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org twitter: magth

Re: [git-users] How to track changes to db

tps://github.com/winebarrel/ridgepole - Java: https://github.com/liquibase/liquibase - Go: https://github.com/golang-migrate/migrate and there are command line tools for it as well - https://github.com/golang-migrate/migrate - https://github.com/aphel-bilisim-hizmetleri/pg-migrator /M -- Magnus Thern

Re: [git-users] How to track changes to db

is you are doing, but it sounds a bit like you are trying to keep track of manual changes you make manually in a DB. Have you looked at making use of a library/framework for migrations instead? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org twitter: m

Re: [git-users] How to effectively use git

test - go to GitLab -> select branch -> somehow deploy > to stating server This is a bit like the first option above. /M [1]: https://docs.docker.com/compose/ -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org twitter: magthe http://m

Re: [git-users] How to effectively use git

SJW writes: > On Monday, 6 July 2020 22:22:49 UTC+10, Magnus Therning wrote: >> >> >> SJW > writes: >> >> > I am still trying to get my head around the best possible way to use git >> > (and failing) >> > >> > Here i

Re: [git-users] How to effectively use git

gs you can try in the meantime: - don't use git for deploy, instead use CI/CD - spin up one staging for each branch you develop on In the end I think the only long-term solution is if QA is folded into development, i.e. that you move the organisation to cross-functional teams, including QA.

Re: [git-users] Re: Add multiple projects under one Git repository

you please suggest a way to handle different projects? A repository per project, or maybe even multiple per project. I suggest letting the code architecture and team organisation guide you when deciding how many repositories you have. /M -- Magnus Therning OpenPGP: 0x927912051

Re: [git-users] how to synchronize repository from local to remote?

Nicola Cantalupo writes: > thank you. > however reading the documentation and various turorials, I have more > doubts than before. so I need some simplification from someone in this > group, please. What have you tried? What happened? What did you expect would happen? /M -- Mag

Re: [git-users] Git workflow recommendations

SJW writes: > On Thursday, 14 May 2020 15:54:31 UTC+10, Magnus Therning wrote: >> >> >> SJW > writes: >> >> > New to Git and I'm using a basic workflow that I'm not sure is that good >> so >> > wanted to post it here for feedback, critique

Re: [git-users] how to synchronize repository from local to remote?

one of the most common operations you perform in git you'll find it in any tutorial worth its salt. There are numerous tutorials, I think the git documentation on GitHub is rather good (though sometimes not 100% clear on separating git-the-tool from GitHub-the-service). https://guides.github.com/intr

Re: [git-users] Git workflow recommendations

d `production` branch to match `master`, and - deploy `production` in the same way you deployd to staging The next step after that would be to set up Gitlab CI so deploys to staging happens automatically on merges/pushes to `master` and to production on pushes to `production`. /M -- Magnus Ther

Re: [git-users] Git, windows and '/' in branch names

Philip Oakley writes: > On 09/10/2019 08:53, Magnus Therning wrote: >> I have a vague memory of there being problems using '/' in branch names on >> Windows. Is that still the case? >> >> /M > > I don't believe so for 'normal' situations (here I'm thinking

[git-users] Git, windows and '/' in branch names

I have a vague memory of there being problems using '/' in branch names on Windows. Is that still the case? /M -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an

Re: [git-users] Getting started to using git

le. Github and Atlassian ought to have some good ones. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org twitter: magthe http://magnus.therning.org/ If you can tell the truth, you don't have to remember anything. — Mark Twain -- You received th

Re: [git-users] OneDev - a new open source git server with unique features

completely, and since I'm using LastPass to generate and keep my passwords I'm sure I'm not entering my credentials wrongly /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org

Re: [git-users] How to enforce permissions?

ledger and the ability to easily and quickly revert changes... and those things are *very* well supported in Git :) /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus

Re: [git-users] creating junction point for folder in the git repository

It might help if you type down the exact commands to reproduce it. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Ah, good taste! What a dreadful thing! Tast

Re: [git-users] How to automate "git commit --amend"

as needed? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus If you can tell the truth, you don't have to remember anything. — Mark Twain -- You received

Re: [git-users] Interactive rebase with reword after conflict

describe on my machine as well. Also, I have to admit that my expected behaviour matches expected behaviour. Interestingly, if I *don't* choose to 'reword', but just to 'pick', the merge conflict happens (as expected) and after `git rebase --continue` I see what I expect. /M -- Magnus Therning

Re: [git-users] Git add vs commit

descriptions of the very basic bits in git, it's well worth watching https://www.youtube.com/watch?v=MYP56QJpDr4 /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Every

Re: [git-users] Environment expansion in .gitconfig?

Michael McNeil Forbes <michael.for...@gmail.com> writes: On Apr 3, 2018, at 12:07 PM, Magnus Therning <mag...@therning.org> wrote: Michael Forbes <michael.for...@gmail.com> writes: Hi, I am trying to find a good solution to this use-case that seems to

Re: [git-users] Environment expansion in .gitconfig?

tand you correctly you rely on the logged in user setting $LC_GIT_USERNAME properly, how is that done? If it's done using some script, maybe you can simply modify that script to *create* the proper ~/.gitconfig at the same time? /M -- Magnus Therning OpenPGP: 0x927912051

Re: [git-users] Branch for git being up-to-date

that's not possible, merge often between the branches. If that's not possible either, check out git-imerge[1]. /M [1]: https://github.com/mhagger/git-imerge -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe

Re: [git-users] Git bridge for Subversion repositories ?

doeetj...@gmail.com writes: > Thanks Magnus! > > It looks solid from what I see, but do you have any word about > git-svn-bridge ? > Curious to know. Nope, never used it, sorry. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.or

Re: [git-users] Git bridge for Subversion repositories ?

e happy when working :) In other places it's been in place before I arrived. It is rather easy to set up and maintain. Though I have to add that I've only ever used it on SVN repos that used a standard Trunk/Tags/Branches layout. /M -- Magnus Therning OpenPGP: 0x927912051716CE

Re: [git-users] Merging my branch into a remote repo, I encounter a merge conflict with a file I have not touched in my branch. What is the best course of action?

see the full diff: git diff I've found it helpful to both be in a nice clean work area, and to have a good grasp of what's about to be merged, before starting the merge. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org

Re: [git-users] how should I structure a repo to support 3+ builds from one source tree ?

ink they are for the whole repo ? I suspect this is entirely language / build-system dependant... because, well, I don't ever run into this problem in the languages I use ;) (C/C++ with CMake, Haskell with stack, Clojure/ClojureScript with lein, ...) So my suggestion would be that you ap

[git-users] Suggestions for writing git hooks?

suggestions for writing git hooks? Are there go-to libs for languages like Python/Lua/Ruby/...? What should I look at? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus

Re: [git-users] When I update a branch from master I don't get the same files as when I create a new branch. Would anyone know why?

What you most likely need to look into is if your git repo are missing source files. Maybe someone created a new file locally and forgot to add it to a changeset? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe

Re: [git-users] Pushing 2 different branches to the same repo, git says the repo has different files each time.

each push. > > Would anyone know why this could happen? I think it'd help if you showed us the exact commands you are typing. Why were you expecting a *merge* confligt when *pushing*? (That expectation suggests that you need to read up a little on what a branch is in git.) /M -- Magnus Therni

Re: [git-users] Noob question: How can I inspect a file 'added by them'?

e you'll get to see what the differences between your changes and theirs are. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus The man who is denied the opportu

Re: [git-users] Re: Git branching and merge strategy for merge with lots of conflicts requiring multiple people

fixing if possible. You are aware of `rerere` I guess, right? I don't know if you can share the recorded resolutions though. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therni

Re: [git-users] Git and Subversion

re formal home within a few weeks, sometimes I've run the bridge myself for the entire time (migrating it to a colleague's machine when I left). In either case, I'm more productive and happy :) /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: ma

Re: [git-users] regarding branch

e`[1] and `pusRemote`[2] may shed some light on the situation. /M [1]: https://git-scm.com/docs/git-config#git-config-branchltnamegtremote [2]: https://git-scm.com/docs/git-config#git-config-branchltnamegtpushRemote -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning

Re: [git-users] Re: Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

e is no Git forum out there, Github > don't provide one and Git itself is archaic (mailing lists) and > Syntervo rely on this Google group, we need a Git forum where everyone > and anyone using Git can get answers to questions. There's this email list, IRC and stack overflow, what other fora do you

Re: [git-users] What's the correct way of selecting 'ours' or 'theirs' when encountering a merge conflict on push?

to: 1. Pull down all changes from the repo (`git pull` or `git fetch`). 2. Check out `master` from the repo (`git checkout`). 3. Replace the file in question with your copy. 4. Commit the changes (`git commit`). 5. Push your changes to the repo (`git push`). /M -- Magnus Therning Ope

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

inutes-12-git-merge-2013-part-4.html -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Hofstadter's Law: It always takes longer than you expect, even when you take into account

Re: [git-users] Git as a photo backup tool

itory, does Git LFS have any advantages at all? > Given the above "photo backup" special-case for large binary files, is it > expected to experience the same problems that are primarily addressed with > Git LFS? > > Any input would very much be appreciated! If I were yo

Re: [git-users] Git branching and merge strategy for merge with lots of conflicts requiring multiple people

st be a better way. > > I've got a big git merge to do. There are lots of conflicts and it > requires many people to resolve them all. Have you looked at git-imerge? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter

Re: [git-users] "Medium" git: Worktrees, submodules, subtrees

re. A quick search offered up this: https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus S

Re: [git-users] git directory/repo structure suggestions

the .\Common files? I'd start with looking at the possibility of using a (shared) build cache for .\Common :) Otherwise see if you can get your CMS tool of choice to share a local .\Common between all locally checked out configurations. > This really is biting me... Just can't think

Re: [git-users] Re: Bash Script For Git Clone

KANNU CHAWLA <kannu.mca.du.2...@gmail.com> writes: > In git how can we access our remote repositories as my ssh command is not > working. That is entirely up to the server where your remote repository is located, options are http(s)://, ssh://, file://, and a few more. /M -- Mag

Re: [git-users] Bash Script For Git Clone

po is useful? https://code.google.com/p/git-repo/ There are other tools that do the same thing. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Software isn't finished un

Re: [git-users] Re: Noob question: pushing files to remote repo I get merge errors on files I have not changed. Why is this?

ne-endings/ /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law. -

Re: [git-users] Re: git filters PATH

in/ and have a bunch of class files down there? > > Does git have a "$GIT_ROOT" that it exports? If not, would this be a good > thing to add? Run `env` in your filter to find out what's available. I suspect one or both of GIT_WORK_TREE, GIT_DIR are set. /M -- Magnus Therning

Re: [git-users] Re: Noob question: pushing files to remote repo I get merge errors on files I have not changed. Why is this?

AD S <a...@radianweb.com.au> writes: > I should add that the merge error message I get is 'both modified' even > though I promise I have not touched these files (let alone even know of > their existence). Are the "changes" line-ending related? /M -- Magnus Ther

Re: [git-users] How to create remote GIT repository?

Michael <keybou...@gmail.com> writes: > What is TFS? Team Foundation Server - https://en.wikipedia.org/wiki/Team_Foundation_Server /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe

Re: [git-users] How to create remote GIT repository?

has gotten git to connect to TFS! /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus I would rather use Java than Perl. And I'd rather be eaten by a crocodile than use Java.

Re: [git-users] GIT API Provider?

user only after the first task has been created in BMC. Surely the hired person is hired to solve tasks, it's then fairly reasonable to just create all the required user accounts up front. Why complicate things? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.o

Re: [git-users] GIT API Provider?

u've used in the past that offers such a functionality, then maybe you can point to some documentation of said functionality? Also, it's worth pointing out that this list is a list for users of git, the APIs you've looked at are *not* git (or Git), they are APIs from github, gitlab and atlassian

Re: [git-users] What is git doing with "git submodule update" that I get coo-coo error: "outside repository"

Xtian Simon <xtiansi...@gmail.com> writes: > On Thursday, November 3, 2016 at 4:06:53 AM UTC-4, Magnus Therning wrote: > >> I notice you don't have a .gitmodules file in the folder in >> question. So, maybe you'll find the reason for the oddity if you first >&g

Re: [git-users] Large SVN to GIT migration

and every commit in the subversion repository and matching the changes to a ruleset after which the changes are applied to a certain path in a git repo. I don't know, but maybe you can come up with rules that'll convert your "staircase development" in SVN to a more common "

Re: [git-users] Large SVN to GIT migration

ith the above are appreciated. It's worth taking a look at https://subgit.com/ to see if that tool can simplify the conversion. It's proprietary, but the licensing is reasonable (https://subgit.com/pricing.html). /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@thernin

Re: [git-users] What is git doing with "git submodule update" that I get coo-coo error: "outside repository"

ou don't have a .gitmodules file in the folder in question. So, maybe you'll find the reason for the oddity if you first locate the .gitmodules file that produces that error? /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter:

Re: [git-users] Selective push (possible ? best approach ?)

filter attribute useful. It lets you run files through a 'smudge' filter on checkout and a 'clean' filter when staging. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magn

Re: [git-users] Yet more git madness

2,800+ files and 250+ > commits) are suddenly in the pull request I was working on (which had 8 > files and 4 commits). Then my suspicion is that this isn't a rant on git, but rather on github and its interface for creating "pull requests". I think you've simply created a pull request w

Re: [git-users] Re: using git for system configuration management

t; which will update all the config files. Similarly you can pull the > repo on some other computer and run the bash file there. Hope this > helps! For a more complicated solution, that doesn't need a bash script, look at the GIT_WORK_TREE environment variable. /M -- Magnus

Re: [git-users] Does git have a way for workflow tools to identify a custom state?

Darragh Bailey <daragh.bai...@gmail.com> writes: > On Wednesday, September 21, 2016 at 10:46:11 PM UTC+1, Magnus Therning > wrote: > >> >> In the past I've had that in my shell prompt. Currently I'm mostly using >> magit and it clearly states when the wor

Re: [git-users] Serena Dimnesions to GIT migration

to use you just add the remote repo and push... I'm guessing from what little I read that you need to use version 14 of Dimensions CM. /M [1]: http://serenacentral.com/blogs/entry/cm-14-2-new-feature-using-a-git-client-to-acess-a-cm-server -- Magnus Therning OpenPGP: 0x927912051716C

Re: [git-users] Beginner Question: Best practices GIT for my website

r site. > Is there a specific way I should set it up specifically for this web > based files? Nope, nothing special should be needed on the git side. > Are the files saved on my drive or on the internet? All files are saved in your local workspace, i.e. (most likely) on your drive.

Re: [git-users] Does git have a way for workflow tools to identify a custom state?

In the past I've had that in my shell prompt. Currently I'm mostly using magit and it clearly states when the workdir is in the middle of a rebase. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe htt

Re: [git-users] non-committed change in a test branch is polluting my master branch

ollute” it. Of course `git reset` *can* be used to do it, you just have to tell it to be hard :) git reset --hard HEAD /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magn

Re: [git-users] git http-backend 500 Internal Server Error

E_USER >- REMOTE_ADDR >- CONTENT_TYPE >- QUERY_STRING >- REQUEST_METHOD As it says on the page you linked to, all of those environment variables should be set by the *invoking web server*, i.e. it's your web server that doesn't invoke `git http-backend` correctly. What h

Re: [git-users] Why the directory, through git clone, has less files of the older directory through git pull origin master?

question I think you're asking ;) Git will only ever store files in .git/ at the top-level. You can ask git files in the work area it doesn't know about by running git clean -ndx You can also ask git what files it does know about, and then count them by running (on Unix) git ls-files |

Re: [git-users] gitlab CE vs gitlab EE vs bitbucket (on-prem) or something else

in less than 5 minutes. The same seems to be true for bitbucket! /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus Finagle's First Law: To study a subject best, unde

Re: [git-users] Newbie: How to get my working tree back using git checkout?

deleted). > > 3. After the deletion, I didn't do either another add or commit. > > Thanks! Try running `git branch` to list the branches you have, then check out the one you want. I suspect that git checkout master works. (Keep in mind that git is case sensitive.) /

Re: [git-users] undoing git init?

mple of what you want to undo. My quick testing suggests that the man page for git-init is correct when it states that Running git init in an existing repository is safe. It will not overwrite things that are already there. /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: m

Re: [git-users] GIT and Hosting Remote Repositories

gitlab.com most certainly is a fully working instance of gitlab. I use gitlab.com for some personal stuff (see e.g. https://gitlab.com/magus/mirage-ping). /M On 7 Jul 2016 6:38 a.m., "JaedenRuiner" wrote: > So, > > Simple question. I do my own development, a lot.

Re: [git-users] Diff & merge dependent on file extension (windows)

On 26 Jun 2016 10:44 a.m., "Gitter" wrote: > > Is it possible to setup diff & merge tool dependent on file extension in the config file ? > Say I want kdiff3 for *.txt and WinMerge for *.xls Check out attributes: https://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes /M

Re: [git-users] Finding which files does a given patch changes

mary --numstat patchFile > > give this info For a non-git solution to your problem you can look at `lsdiff` from patchutils: http://cyberelk.net/tim/patchutils/ /M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org jabber: mag...@therning.org twitter:

  1   2   3   4   >