[git-users] [SOLVED] (was: how to rename the master branch on sourceforge)

2023-12-29 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > Hi > I just set up a sandbox (clone of the true repository) > I tried out the following >1. git branch -m master default >2. Change the «gitlab-default» branch to something else >3. git push origin

[git-users] how to rename the master branch on sourceforge

2023-12-29 Thread Uwe Brauer
Hi I just set up a sandbox (clone of the true repository) I tried out the following 1. git branch -m master default 2. Change the «gitlab-default» branch to something else 3. git push origin --delete master 4. git push origin -u default 5. Set the default br

[git-users] [SOLVED?] (was: Avoid conflicting merges for the other user by using revert (does not work))

2023-11-21 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: Sorry, I am an idiot. Below a solution, not sure whether it is the best solution > * Avoid conflicting merges for the other user by using revert > Hi > Usually if two users push to a common repository conflicting merges might

[git-users] Avoid conflicting merges for the other user by using revert (does not work)

2023-11-21 Thread Uwe Brauer
* Avoid conflicting merges for the other user by using revert Hi Usually if two users push to a common repository conflicting merges might occur, and can be resolved manually. I am faced with a situation (with students who don't know git and only use git via matlab's restricted git interface)

Re: [git-users] conflicting merges (git equivalent of hg resolve)

2023-11-17 Thread Uwe Brauer
> On Fri, Nov 17, 2023 at 03:11:29PM +0100, Uwe Brauer wrote: > [...] > I'm afraid this situation might be not as straightforward as you think. > The message > should be interpreted literally: Git did not even attempted a merge operation > because you have unmerged

[git-users] conflicting merges (git equivalent of hg resolve)

2023-11-17 Thread Uwe Brauer
ave appreciated since it explains better the problem) it seems only necessary to manually fix the conflicts and then run git commit -a -m "Merge resolved" Is this correct? Thanks Uwe Brauer -- I strongly condemn Hamas heinous atrocities on Israel, especially the despicable pog

Re: [git-users] What is the structure of Git tree, commit, and tag objects that get hashed to produce an object ID?

2023-11-15 Thread Uwe Brauer
> On Tue, Nov 14, 2023 at 10:10:00AM -0800, Andrew Lilley Brinker wrote: > [...] > [...] > [...] > In addition to what Philip has said, I would recommend "Git from the bottom > up" [1, 2] and "Git for computer scientists" [3], which are not-so-gentle > introductions to Git focussing precisely on

Re: [git-users] Re: [gitlab forks (keys)]

2023-10-26 Thread Uwe Brauer
Yes Sent from my iPhone > On 26. Oct 2023, at 19:48, Konstantin Khomoutov wrote: > > On Thu, Oct 26, 2023 at 07:20:18PM +0200, Uwe Brauer wrote: > >> No: >> >>1. A message appears, you are behind 2 commits (concerning the repo >> you forked) &

[git-users] Re: [gitlab forks (keys)]

2023-10-26 Thread Uwe Brauer
> On Thu, Oct 26, 2023 at 06:20:07PM +0200, Uwe Brauer wrote: > You mean, GitLab sends them a mail message, right? No: 1. A message appears, you are behind 2 commits (concerning the repo you forked) 2. A button appears, saying update fork (since the fork, my repo

[gitlab forks (keys)] (was: [git-users] how to exclude certain directories from push)

2023-10-26 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Wed, Oct 25, 2023 at 02:15:43PM +0200, Uwe Brauer wrote: >> If after one week I push again to my gitlab repository >> (pushing the new subdirectory), >> >> 1. how will the students notice that in th

Re: [git-users] how to exclude certain directories from push

2023-10-25 Thread Uwe Brauer
> On Wed, Oct 25, 2023 at 02:15:43PM +0200, Uwe Brauer wrote: > [... I cut one piece from here to reply to it separately - see below ...] > Well, the expanded explanation is exactly how I imagined it after reading your > initial mail, so I basically have nothing to add

Re: [git-users] how to exclude certain directories from push

2023-10-25 Thread Uwe Brauer
> On Tue, Oct 24, 2023 at 06:38:50PM +0200, Uwe Brauer wrote: > [...] > Do you mean the repository has to begin with zero or, say, one such > subdirectory, and others have to appear there picemeal - as you add them? Right, and I think I explained my workflow poorly. So let me start

[git-users] how to exclude certain directories from push

2023-10-24 Thread Uwe Brauer
t are themselves under git control. But then I am not sure how I could merge it later to the main repository. Any suggestions would be very welcome Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Hamas bestialic terroristic attack on Israel, espec

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

2023-08-16 Thread Uwe Brauer
I have the same workflow (LaTeX for academic publication, using a VC system, but also for collaboration with co-authors) I always use in the context you describe branches. The cor version might need to be modified, and this is where branches are useful. I am not entirely sure what you mean by fork,

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

2023-08-07 Thread Uwe Brauer
> Ha, thanks, excellent question, I did not check: ☹️ before asking > 1. Ubuntu: 2.38.1 > 2. MacOS: 2.24.3 Oops, google tells me As of Git 2.28 (released 27th July 2020), you can now configure the name of the branch created when you init a new repository: git config --global init

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

2023-08-07 Thread Uwe Brauer
>>> "m" == magnus writes: > Uwe Brauer writes: >> [[S/MIME Signed Part:Undecided]] >> >> Hi >> >> This is very odd indeed. I have basically the same (global) >> .gitconfig in my home directory in >> Linux (Ubuntu) and i

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

2023-08-07 Thread Uwe Brauer
wrong here? Some case is wrong for MacOS? Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the NATO membership of the Ukraine. I s

[git-users] configure git: git merge --abort should be displayed

2023-07-16 Thread Uwe Brauer
try to solve a merging/editing conflict. So the idea is: they should 1. Abort 2. Inform me I then would 1. revert my last commit, 2. push again, 3. so they can then pull 4. Push their commit (which is in conflict to mine) 5. But then I pull and then resolve th

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-11 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Tue, Jul 11, 2023 at 08:20:23PM +0200, Uwe Brauer wrote: >>> Do I assume correctly that you have had that configuration option set in >>> some >>> of the Git configuration sources? >> >&g

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-11 Thread Uwe Brauer
> On Mon, Jul 10, 2023 at 09:51:12PM +0200, Uwe Brauer wrote: > [...] > Do I assume correctly that you have had that configuration option set in some > of the Git configuration sources? Well I had in my global .gitconfigure file indeed the line [pull] rebase = true

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-10 Thread Uwe Brauer
is to false and see what happens that was the culprit. Thanks all of your for your patience. Should have checked by configuration first 😳 Regards > On 7/10/23 12:01, Uwe Brauer wrote: -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-10 Thread Uwe Brauer
>>> "CS" == Chris Stone writes: > from https://git-scm.com/docs/git-config > pull.ff > By default, Git does not create an extra merge commit when merging a > commit that is a descendant of the current commit. Instead, the tip > of the current branch is fast-forwarded. When set to |fa

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-10 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Mon, Jul 10, 2023 at 06:30:04PM +0200, Uwe Brauer wrote: >> While in mercurial «hg fetch» is equivalent to «hg pull» and «hg merge» >> >> it seems that «git pull --no-ff» is not equivalent to >> «git

[git-users] git pull --no-ff is not equivalent to git fetch+merge

2023-07-10 Thread Uwe Brauer
conflicting) commit to the server now user2 has either to pull --no-ff or fetch+merge. - Here is the graph before the pull/fetch git log --graph --all * commit b178f66fa7cf7759c880ac6e4f388cf5fc590075 (HEAD -> default) | Author: Uwe Brauer | Date: Mon Jul 10 18:21:22 2023 +0

Re: [git-users] gitlab: how to efficiently share repository and then delete the share

2023-07-05 Thread Uwe Brauer
> On Wed, Jul 05, 2023 at 01:46:02PM +0200, Uwe Brauer wrote: > As with any programmatic activities, you'd most probably need to use > one of the available APIs [1]. In the simplest case, GitLab can > provide you with a "token" which you then include to HTTP re

[git-users] gitlab: how to efficiently share repository and then delete the share

2023-07-05 Thread Uwe Brauer
once a student forks a repository and then share it with me, he leaves the group and I cannot only undo the share individually. Any help would be appreciated. Thanks and regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggre

Re: [git-users] How to print log tree

2023-06-10 Thread Uwe Brauer
>>> "ZH" == Zhanbang He writes: > Thanks, it works for me based on your command. > This is my command `git log --graph --color=always --all --decorate > --oneline --since="2023-6-6" | git name-rev --annotate-stdin`. > One drawback of my command is that it does not show the time of commit.

Re: [git-users] How to print log tree

2023-06-10 Thread Uwe Brauer
> On Thu, Jun 8, 2023 at 12:56 AM Konstantin Khomoutov > wrote: > no good, it only shows simple-line commits. Try one of these git log --graph --color=always --all --decorate --pretty | git name-rev --annotate-stdin | less -R git log --graph --color=always --branches --remotes --deco

Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-24 Thread Uwe Brauer
> On Tue, May 23, 2023 at 1:21 AM Uwe Brauer wrote: > Perhaps. There's many features I would like to port first. > Once that's done I might consider implementing this properly. Ok I understand > But Junio didn't refuse the proposal, he just didn't respo

Re: [git-users] [ANNOUNCE] git-fc 0.1: new fork of git for users

2023-05-22 Thread Uwe Brauer
>>> "FC" == Felipe Contreras writes: > git-fc is a fork of Junio Hamano's git. > It's targeted to the users of the git tool. > Completely forking the code opens the doors to many possibilities, for > example moving to saner defaults, such as zdiff3 and rebase preserve > merges. Using libgit2, o

[git-users] after pulling from remote, move last commit into a new branch and push

2023-04-22 Thread Uwe Brauer
whether everything is fine. It looked. So git switch -c org-mode -t origin/org-mode I edited committed and pushed But now * commit 2338bb2167f7e2e2b078be3d8906507794b5752f (org-mode) (HEAD -> org-mode, origin/org-mode) | Author: Uwe Brauer | Date: Sat Apr 22 14:37:02 2023 +0

[git-users] [Push solved, but pull?] (was: [and remote branch tracking])

2023-04-22 Thread Uwe Brauer
> On Tue, Apr 18, 2023 at 1:03 AM Uwe Brauer wrote: Hi > It does here. > ( > git init git-repo > cd git-repo > echo one > content > git add content > git commit -m 'one' > ) > hg init hg-repo > ( > git clone git-repo prox

[git-users] Re: [and remote branch tracking]

2023-04-18 Thread Uwe Brauer
>>> "FC" == Felipe Contreras writes: > On Tue, Apr 18, 2023 at 1:03 AM Uwe Brauer wrote: >> >> > On Mon, Apr 17, 2023 at 3:05 PM Uwe Brauer wrote: >> >> > git push hg-remote >> > remotes/origin/modernize:refs/heads/branches/m

[git-users] Re: [and remote branch tracking]

2023-04-17 Thread Uwe Brauer
> On Mon, Apr 17, 2023 at 3:05 PM Uwe Brauer wrote: > git push hg-remote remotes/origin/modernize:refs/heads/branches/modernize Does not push the git branch modernize to the named branch modernize, sorry > Only if you don't specify the refspec, which is the typical way

[git-users] Re: [and remote branch tracking]

2023-04-17 Thread Uwe Brauer
> On Mon, Apr 17, 2023 at 1:19 AM Uwe Brauer wrote: > Those are *suggestions* of what you should run. It doesn't do > anything, and obviously you shouldn't do `git switch HEAD`. > The error message is pretty much telling you what to do: > git push hg-remote remo

[git-users] [step by step] (was: [and remote branch tracking])

2023-04-17 Thread Uwe Brauer
> On Sun, Apr 16, 2023 at 2:31 PM Uwe Brauer wrote: > You cannot push a branch you don't have. Obviously. > But you can create the branches without checking them out, as I > already explained: > git for-each-ref --format='git switch %(refname:lstrip=3)' >

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Uwe Brauer
> On Sun, Apr 16, 2023 at 2:31 PM Uwe Brauer wrote: > You cannot push a branch you don't have. Obviously. > But you can create the branches without checking them out, as I > already explained: > git for-each-ref --format='git switch %(refname:lstrip=3)' >

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Uwe Brauer
> On Sun, Apr 16, 2023 at 3:01 AM Uwe Brauer wrote: > git-remote-hg, and I wouldn't call it a "plugin", git doesn't have > plugins. It's just a tool. > I'm not sure what's going on here, as I don't have the code of > `mygit-push-named-bra

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Uwe Brauer
>>> "FC" == Felipe Contreras writes: > On Sun, Apr 16, 2023 at 3:01 AM Uwe Brauer wrote: >> >> > git for-each-ref --format='git switch %(refname:lstrip=3)' >> > refs/remotes/origin >> > git-remote-hg, and I wouldn't

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Uwe Brauer
> git for-each-ref --format='git switch %(refname:lstrip=3)' > refs/remotes/origin Changing slightly the topic, when I am using your git-hg-remote plugin I need to do a lot of pushes from git branch to mercurial named-branches like git remote add hg-remote hg::../mercurial-matlab-emacs-de

[git-users] Re: [and remote branch tracking]

2023-04-16 Thread Uwe Brauer
> On Sat, Apr 15, 2023 at 2:35 AM Uwe Brauer wrote: > Not all references are branches, but all the ones that are branches > are fetched, except in a different namespace: /refs/remotes. > Local branches are /refs/heads, and that's what `git branch` shows. > Remote branches

Re: [git-users] what is the most efficient way to mirror a repository

2023-04-16 Thread Uwe Brauer
>>> "FC" == Felipe Contreras writes: > On Fri, Apr 14, 2023 at 3:25 PM Uwe Brauer wrote: >> > 1. Clone the original repo: >> >> > git clone --mirror o...@git.code.sf.net/p/matlab-emacs/src >> >> >> That worked as I expec

[and remote branch tracking] (was: [git-users] what is the most efficient way to mirror a repository)

2023-04-15 Thread Uwe Brauer
> On Fri, Apr 14, 2023 at 04:38:34PM +0200, Uwe Brauer wrote: > Well, your approach is incorrect. ;-) > A correct one is going to be quicker, too. > As I've explained in this list in the past, _by default_ Git implements > asymmetric approach to handling remote repositori

Re: [git-users] what is the most efficient way to mirror a repository

2023-04-14 Thread Uwe Brauer
> On Fri, Apr 14, 2023 at 04:38:34PM +0200, Uwe Brauer wrote: > Well, your approach is incorrect. ;-) > A correct one is going to be quicker, too. > As I've explained in this list in the past, _by default_ Git implements > asymmetric approach to handling remote repositori

Re: [git-users] what is the most efficient way to mirror a repository

2023-04-14 Thread Uwe Brauer
> On Fri, Apr 14, 2023 at 04:38:34PM +0200, Uwe Brauer wrote: > Well, your approach is incorrect. ;-) > A correct one is going to be quicker, too. > As I've explained in this list in the past, _by default_ Git implements > asymmetric approach to handling remote repositori

[git-users] what is the most efficient way to mirror a repository

2023-04-14 Thread Uwe Brauer
hes, 10, before run git push -u gitlab --all? Is there any quicker way? Thanks Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the

Re: [git-users] how is name-rev determined

2023-03-23 Thread Uwe Brauer
> On Wed, Mar 22, 2023 at 2:37 PM Uwe Brauer wrote: > Yes. "branches/default", and "branches/stable". > Yes. > If it's named "bug-fix" it's created as a bookmark, if it's named > "branches/bug-fix", it's created as a

Re: [git-users] how is name-rev determined

2023-03-22 Thread Uwe Brauer
>>> "FC" == Felipe Contreras writes: > On Thu, Mar 16, 2023 at 3:26 PM Uwe Brauer wrote: >> > I wrote the equivalent of hg-git for the git world: git-remote-hg [1], >> > and there exporting named branches works fine. They have the >> > "bra

Re: [git-users] how is name-rev determined

2023-03-16 Thread Uwe Brauer
> On Sat, Mar 11, 2023 at 1:11 PM Uwe Brauer wrote: > You are a much more positive person than me. I've had countless > discussions with positive reactions who lead to nothing. It seems this > is going to be another one of those. Or just more naive 😉 > After just o

Re: [git-users] how is name-rev determined

2023-03-11 Thread Uwe Brauer
> On Thu, Mar 9, 2023 at 8:07 PM Felipe Contreras > wrote: > FWIW I updated the patches and sent them to the dev mailing list so > they stay on the record: > https://lore.kernel.org/git/camp44s0cbum1jzyp57ninikwsxg9kugbkdaoozmnen1akvg...@mail.gmail.com/T/#t I just skimmed over the thread. It

Re: [git-users] how is name-rev determined

2023-03-11 Thread Uwe Brauer
> On Thu, Mar 9, 2023 at 8:07 PM Felipe Contreras > wrote: > FWIW I updated the patches and sent them to the dev mailing list so > they stay on the record: Thanks! I have not heard anything back from the hg-git guys, at some point they told me they want bookmarks to be more than git branche

Re: [git-users] how is name-rev determined

2023-03-06 Thread Uwe Brauer
Last try >>> "UB" == Uwe Brauer writes: >> On Sat, Mar 4, 2023 at 1:39 AM Uwe Brauer wrote: >> It's calculated on the fly. Ok, that I was afraid of. > Weirdly enough, I wrote a blog post [1] about a debate in 2012 > precisely about the diff

Re: [git-users] Re: how is name-rev determined

2023-03-06 Thread Uwe Brauer
>>> "PO" == Philip Oakley writes: Hi Philip, > Hi Uwe, > (supplemental to Felipe's reply) I hope this message goes to the mailing list, I answered Felipe's mail and again the message to the mailing list was rejected. That happened to Tassilo some time ago. Sigh. > Underlying the 'branch name

[git-users] how is name-rev determined

2023-03-03 Thread Uwe Brauer
alled? Thanks and regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the ban of Russia from SWIFT. I support the EU membership of the

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

2023-03-03 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Fri, Feb 24, 2023 at 02:51:30PM +0100, Uwe Brauer wrote: >> Sorry if this off-topic but I got curious. I stumbled of the talk Linus >> Thorvald gave in 2007 about git > [...] > Ah, just noticed - while we'

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

2023-02-26 Thread Uwe Brauer
> Uwe Brauer writes: > Hi Uwe, > Yes, accessing remote file systems with ssh was already a thing in 2007. > And I also think that "git daemon" explained on the next page of the > docs existed back then. Similarily, you could expose your git > repository (read-only)

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

2023-02-25 Thread Uwe Brauer
> On Fri, Feb 24, 2023 at 06:41:02AM -0800, Philip Oakley wrote: > I would also not be susprised if at leat some of the repos (those maintained > by "the leutenants") were hosted using the same infrastructure which was > hosting (and still does) the kernel tarballs, the mailing list and its > arc

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

2023-02-24 Thread Uwe Brauer
exist, only sourceforge if I remember correctly. Git is only a client software, as far as I know. Anybody knows how this was done in 2007? Regards Uwe Brauer Footnotes: [1] (his accent seems to be quite good, although I am no native speaker...). His jokes about CVS and subversion are

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-10 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Thu, Feb 09, 2023 at 11:10:48PM +0100, Uwe Brauer wrote: > [...] >> Right now I am most worried about the situation in which the student >> need to perform a merge. I regularly pull from their repos, check, wri

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-09 Thread Uwe Brauer
>>> "PO" == Philip Oakley writes: > Uwe, > Do the individual students have any form of personal 'HOME' storage for > saving their local project work? > How is that organised? I guess emails are all done via a web browser and > 'cloud' storage, so that would provide no guidance. Likewise much

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-09 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Wed, Feb 08, 2023 at 10:34:46PM +0100, Uwe Brauer wrote: > [...] >> It seems to me that the credential helper system might be helpful for a >> single user szenario. >> >> But PC running Win

Re: [git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-08 Thread Uwe Brauer
> On Fri, Feb 03, 2023 at 09:15:16PM +0100, Uwe Brauer wrote: > Sorry for the late reply - did not notice your mail in time. No worries at all, thanks that you take time to look into that > Git has the concept of credential "helpers" which can also cache the (valid) > c

Re: [git-users] a new branch created, with interrupts the graph

2023-02-06 Thread Uwe Brauer
My answer was cut in the middle I resend it later sorry Sent from my iPhone > On 6. Feb 2023, at 19:33, Uwe Brauer wrote: > >  >>> On Mon, Feb 06, 2023 at 03:13:55PM +0100, Uwe Brauer wrote: >> >> I'm not sure I follow as I failed to parse what does &q

Re: [git-users] a new branch created, with interrupts the graph

2023-02-06 Thread Uwe Brauer
> On Mon, Feb 06, 2023 at 03:13:55PM +0100, Uwe Brauer wrote: > I'm not sure I follow as I failed to parse what does "interrupted the graph" > stands for, but let me have a guess. Oh this is essential, usually "*" stands for a commit and commits ar

[git-users] a new branch created, with interrupts the graph

2023-02-06 Thread Uwe Brauer
t way to solve this 1. Merge and then reset git to his change set? 2. Rename his branch again to default (but I am afraid that git gets confused with the local branch called default and the one on origin.) So any suggestion would be very much appreciated. Regards Uw

[git-users] slightly off topic: Windows11+git+https access (matlab) where are the credentials stored

2023-02-03 Thread Uwe Brauer
mmand shell) That would allow to clone/push/pull via https but storing the credentials in a different file? Thanks and regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver

Re: [git-users] Hi guys, I just converted a Java project from CVS to GIT, and since then I receive the following error: error reading commons-logging.jar

2023-01-27 Thread Uwe Brauer
s were simpler, and I never have really binaries (well PDFs sometimes) in my repositories. https://www.mercurial-scm.org/wiki/RepositoryConversion 2. Then use the hg-git plugin to push to a git repository https://hg-git.github.io/ Uwe Brauer -- Warning: Content may

Re: [git-users] git blame display name-rev?

2022-12-15 Thread Uwe Brauer
> Uwe Brauer writes: > Here we go: > auctex on  master took 7s > ❯ git blame -l tex.el | git name-rev --refs=master --name-only > --annotate-stdin | head > master~624 (Tassilo Horn 2020-09-04 17:19:57 +0200 1) > ;;; tex.el --- Support for TeX do

[git-users] git blame display name-rev?

2022-12-15 Thread Uwe Brauer
) master~5 (David Kastrup2005-03-28 5) ;; Maintainer: auctex-de...@gnu.org master~100 (David Kastrup2003-02-1514) Using git name-rev HEAD Any idea how to achieve this? Thanks Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-10 Thread Uwe Brauer
apitalistic view here. I feel if I receive help and support from the list, I should pay it back and help others, or to put it more philosophical the moral obligation to help > Still, I have to admit that it's Uwe Brauer who first nailed the source of > the > Sebastian's

Re: [git-users] off topic, git host without ssh for pushing

2022-12-10 Thread Uwe Brauer
> On 09/12/2022 18:50, Uwe Brauer wrote: > So where is the project folder that contains the student's '*.m' files? > For that 'folder' is where Git Gui, or SourceTree or Git Extensions will > store/access the local repository (i.e. `.git` folder) That i

Re: [git-users] the underlying git version in gitlab/github and bitbucket.

2022-12-10 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Fri, Dec 09, 2022 at 07:59:52PM +0100, Uwe Brauer wrote: > [...] >> (hg) push -f >> >> That is a forced push, github and bitbucket accept that, while gitlab tells >> me >> >> abort:

Re: [git-users] off topic, git host without ssh for pushing

2022-12-10 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Fri, Dec 09, 2022 at 04:53:26PM +0100, Uwe Brauer wrote: >> I sorry if this is slightly off topic. Next semester I want to run an >> experiment and encourage my students to use a VC for their coding, and >> sin

[git-users] the underlying git version in gitlab/github and bitbucket.

2022-12-09 Thread Uwe Brauer
shing refs/heads/main overwrites d30105a181c4 I will of course ask the hg-git developers But any comments especially concerning the git version would be appreciated. Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggressi

Re: [git-users] off topic, git host without ssh for pushing

2022-12-09 Thread Uwe Brauer
> On Fri, Dec 09, 2022 at 04:53:26PM +0100, Uwe Brauer wrote: > Is it possible to have uni admins host a bunch of Git repositories on > premises? Git is sort-of self-hosting in the sense you only need a web server > which can do URL rewriting and CGI, so Apache and Nginx - top picks

Re: [git-users] off topic, git host without ssh for pushing

2022-12-09 Thread Uwe Brauer
Hi Philip, > Hi Uwe, > On 09/12/2022 15:53, Uwe Brauer wrote: > A clarification here. > Do the students have, or are allowed, USB access to the desktops? Or are > the desktops locked down? That is a good question. I know that in the past they did not, because of Viruses (needl

[git-users] off topic, git host without ssh for pushing

2022-12-09 Thread Uwe Brauer
iable known service supports still pushing via https and simple password? Gitlab? Thanks and regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military.

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-03 Thread Uwe Brauer
>>>writes: >> Wait, are you saying that you clone your repositories on OneDrive and >> and there you act (commit pull and push) > Exactly - that's how I've been operating for a long time and I've never had > any problems - everything has always worked correctly and I have the added > secu

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-03 Thread Uwe Brauer
>>>writes: >> Wait, are you saying that you clone your repositories on OneDrive and >> and there you act (commit pull and push) > Exactly - that's how I've been operating for a long time and I've never had > any problems - everything has always worked correctly and I have the added > secu

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-03 Thread Uwe Brauer
>>>writes: > As I used "clone address_repository" in git bash, it cloned to the user's > directory and I could open this repository later in the Git GUI. > It's just that how I DON'T want to do it that way, because I keep my projects > in a different location. > As from within Sourcetree I

Re: [git-users] Re: The git projects disappeared after the updated

2022-12-03 Thread Uwe Brauer
- git clone git://git.savannah.gnu.org/auctex.git - or git clone g...@bitbucket.org:kalthad/emacs-matlab-sandbox.git - git clone https://kalt...@bitbucket.org/kalthad/emacs-matlab-sandbox.git Then once you clone it cd into-the-cloned-repository git branch -a git log --graph --all O

Re: [git-users] git log fails: Segmentation fault (core dumped) for GNU emacs

2022-11-21 Thread Uwe Brauer
> I think I will try to upgrade git. I tried 2.18 and it crashes again, I tried 2.38 and used git log --since=2years --graph --color=always --all --decorate --pretty=short | git name-rev --annotate-stdin | less -R And that worked like charm Thanks -- Warning: Content may be disturbing to so

Re: [git-users] git log fails: Segmentation fault (core dumped) for GNU emacs

2022-11-21 Thread Uwe Brauer
>>> "TH" == Tassilo Horn writes: > Uwe Brauer writes: >> On the other hand it is possible to use the following git command to >> obtain a more or less similar information >> >> git log --graph --color=always --all --decorate --pretty=short | git n

[git-users] git log fails: Segmentation fault (core dumped) for GNU emacs

2022-11-21 Thread Uwe Brauer
reason is that git «calculates» these numbers on the fly. So a simple solution to the problem would be to reduce the numbers of name-rev git shall calculate. I cannot find any option doing this. Any idea what to do? Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I

Re: [git-users] no colors for graph

2022-11-19 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Sat, Nov 19, 2022 at 08:20:41AM +0100, Uwe Brauer wrote: >> Being a mercurial user I want the git graph to look as close as possible to >> mercurials, >> >> The following command/alias does this, bu

[git-users] no colors for graph

2022-11-18 Thread Uwe Brauer
? Thanks Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the ban of Russia from SWIFT. I support the EU membership of the Ukrai

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-17 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: First of all thanks very much for your time and patience to explain git. I appreciate it. Truth being told, most software is today developed in git not mercurial[3], facebook being the only exception, I can think of. So even with the hg-git plugin, knowing

[a nice script for checking out all branches] (was: [git-users] an elementary question how to switch/checkout a remote branch)

2022-11-16 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: >> So I think my question boils down, when and how do I obtain a local copy >> of a remote branch in order to do some changes and push them. > * bug-fix > feature > main > remotes/origin/HEAD -> origin/main

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-15 Thread Uwe Brauer
> So I think my question boils down, when and how do I obtain a local copy > of a remote branch in order to do some changes and push them. I did a different experiment, and cloned a repository that has 3 branches on remote, after cloning git branch -a Tells me * main remotes/origin/HEAD -

Re: [git-users] an elementary question how to switch/checkout a remote branch

2022-11-15 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Mon, Nov 14, 2022 at 05:57:27PM +0100, Uwe Brauer wrote: >> I am sorry for such an elementary question, but using mainly hg, I found >> the following very confusing. > No, the question is not elementary, and yes,

[git-users] an elementary question how to switch/checkout a remote branch

2022-11-14 Thread Uwe Brauer
be correct but git branch -a gives me main * remotes/origin/feature remotes/origin/HEAD -> origin/main remotes/origin/feature remotes/origin/main So it seems the branch is now duplicated? Confusing. Can I edit+commit+push without problems? I am afraid to scew up things Thanks Uwe

Re: [git-users] Re: Feature Request - Branch Metadata or Descriptions

2022-07-19 Thread Uwe Brauer
ata, my only experience is based on git repositories that have been converted to mercurial and to which later named branches have been added Regards Uwe Brauer -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscri

Re: [git-users] About config

2022-06-07 Thread Uwe Brauer
> On Mon, Jun 06, 2022 at 08:55:20AM -0700, Davide Erba wrote: > [...] > $ sudo checkinstall make install Just to add, there is also auto-apt which helps checkinstall later to keep tracks of things. Maintenance of that package is critical and I think it has been removed in recent Ubuntu

Re: [git-users] graphical interface for git (in Windows OS)

2022-05-11 Thread Uwe Brauer
>>> "TH" == Tassilo Horn writes: Hi Tassilo > Uwe Brauer writes: > Hi Uwe, >> I am a Linux user and rely on the command line for dealing wit git. >> However my students a graphical require a graphical interface. > Some co-workers of mine use Git Extens

Re: [git-users] graphical interface for git (in Windows OS)

2022-05-11 Thread Uwe Brauer
> On Wed, 11 May 2022 at 23:51, Uwe Brauer wrote: > git-gui has a commit button. > It is one of the five buttons to the left of the commit message pane. > But if you start git-gui outside a repository, these widgets won't be > visible until git-gui is told which reposi

Re: [git-users] graphical interface for git (in Windows OS)

2022-05-11 Thread Uwe Brauer
>>> "BG" == Ballin Guillaume writes: > Why not using git gui/gitk ? Thay are the official graphical interface for > git and they works perfectly on linux, macos and windows. Ah, thanks I had a quick look (I am on Ubuntu 16.04 and maybe it is a bit outdated). I have to test it more, but right no

[git-users] graphical interface for git (in Windows OS)

2022-05-11 Thread Uwe Brauer
nment. Any advice is very welcome. 2. https://tortoisegit.org/download: I am a bit acquainted with tortoisehg on linux, but have not idea about it on MS Windows. Any comments? Thanks and regards Uwe Brauer -- I strongly condemn Putin's war of aggression against the

Re: [git-users] slightly off topic is there any graph functionaliy in github?

2022-03-01 Thread Uwe Brauer
>>> "KK" == Konstantin Khomoutov writes: > On Mon, Feb 28, 2022 at 10:42:39PM +0100, Uwe Brauer wrote: >> I use basically the command line and very often the log --graph >> >> Command. In bitbucket the repository shows the commits in graph form,

[git-users] slightly off topic is there any graph functionaliy in github?

2022-02-28 Thread Uwe Brauer
Hi I use basically the command line and very often the log --graph Command. In bitbucket the repository shows the commits in graph form, but it seems that github has no such functionality, am I missing something? Regards Uwe Brauer -- I strongly condem Putin's war of agression ag

[SUBVERSION?] (was: [git-users] A more advanced git system with working trees per commit.)

2021-12-29 Thread Uwe Brauer
>>> "s" == skybuck2000 writes: > Now this is something to my liking. > A git system where each commit and each branch has it's own working tree ?! Why don't you give subversion a try? Maybe you would be happier this way. -- You received this message because you are subscribed to the Google Gr

  1   2   >