Re: [git-users] Fast method to get a range diff that excludes merges

2023-05-01 Thread 'Samuel Stern' via Git for human beings
Reviving this thread, since I never quite got to my solution. Here's an interesting tool I found which attempts to solve this problem: https://git.sr.ht/~nhaehnle/diff-modulo-base However it's designed more for rebases, and it doesn't seem to produce the correct (where correct === what GitHub

Re: [git-users] Weird merge records

2023-05-01 Thread Dan Stromberg
On Friday, April 28, 2023 at 2:19:07 PM UTC-7 Tassilo Horn wrote: Dan Stromberg writes: > I'm getting _many_ Merge records that look like: > Merge branch 'develop' of ghosthub.whatever.net:abcd-def/ghij-jk… > > ...and I don't know where they are coming from. > > The merge records do not

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

2023-05-01 Thread Felipe Contreras
On Sat, Apr 22, 2023 at 7:53 AM Uwe Brauer wrote: > I pulled for a remote server and obtained > > * commit b7007223bd7c99b9d92911c66411b2143a791ce4 (master) (origin/master, > origin/HEAD, master) > | Author: John Ciolfi > | Date: Mon Apr 10 16:05:31 2023 -0400 > | > | matlab and org mode

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

2023-05-01 Thread Felipe Contreras
On Sat, Apr 22, 2023 at 3:02 AM Uwe Brauer wrote: > So as you can see the git hashed was not copied. > So if I wished to use that repository and push via hg-git I cannot > because hg tells me that there are commits missing and when I pull, he > just pulls everything his way (that is converting