git-for-windows/git

A fork of Git containing Windows-specific patches.

Balazs Varnai

@bvarnai

@dscho Perfect, thanks! I won't. I know my question is kind of odd, but Git bash has become the default environment to run shell scripts on Windows. It's so convenient to install just one tool as a bootstrap.

Gnevo

@Gnevo

Hi
I wonder if there is a way of NOT merging/uploading unfinished tasks?
My problem is that we need to shift focus because of urgent problems to solve. That means that we are pausing current work, solving the production problem and then shifting back to the original case.

Matthias Aßhauer

@rimrul

Sure. You can either stash your interrupted work and unstash it when you come back or alternatively create a local WIP commit and ammend that when you come back.

Gnevo

@Gnevo

Sure. You can either stash your interrupted work and unstash it when you come back or alternatively create a local WIP commit and ammend that when you come back.

Aha great, will test and let you know.

Brent Arias

@brentarias

What is the difference between these two commands...

git checkout <source_branch> <files>
git checkout --patch <source_branch> <files>

Anything?

Johannes Schindelin

@dscho

The --patch version lets you select interactively what parts you want to apply. Without --patch, the entire changes relative to the current HEAD will be applied to the specified files.

Md. Habibullah

@habibullah1090

David Macek

@elieux

Hi.

Noômen Ben Hassin

@bnhassin

hi!

1 reply

David Macek

@elieux

Hi.

Lucy Phipps

@landfillbaby:matrix.org

[m]

where in the makefiles is compat-bash.exe built?

Lucy Phipps

@landfillbaby:matrix.org

[m]

nvm found it, it was in the MINGW-packages repo, mingw-w64-git/{compat-bash.res,git-wrapper.c}

Ɖanny Ɖevcoin

@MasterGrimaldi_twitter

The --patch version lets you select interactively what parts you want to apply. Without --patch, the entire changes relative to the current HEAD will be applied to the specified files.

Just popping in to say thank you Johannes, and everyone else who is a working part of this project. You guys are doing gods work. Thank you for git-for-windows. I am using it in my Cmder software package and it is incredible as it teaches me the answers I've long looked for and it also helps me understand how everything that is (lets call it YOOnix)-like has worked around to this day. I find the history of technology from hardware to coders to engineers and electrical, digital, radio communication the most fascinating cumulative mathematics I have ever seen. I hope everyone gets the life they envisioned from this effort when it is revealed to the world by a voice that's loud enough to wake them up. I prefer to thank you in advance. Sincerely. -Daniel aka satoshi0x on Keybase :)

Vyapaari

@vyapaari

i want to work with the mintty team

Miguel Dorta

@ellipticaldoor

hi, could be possible to use pacman from git for windows directly

David Macek

@elieux

Hi. I think the official way would be to use the SDK.

Brent Arias

@brentarias

I have a merge conflict between a feature branch, and my master branch. Normally I would resolve this by merging master into my feature branch, resolving the conflict(s), and then merging back.
However, I want to pollute my feature branch with all the other things on master. How can I perform a merge to my feature branch only of the file conflicts?

David Macek

@elieux

You can merge an older commit on master if that helps.

clunion

@clunion

Hi, landed here while searching for info on a not-trusted key of the git-for-windows installation in Msys2.
Just got it working in Msys2 (and VSCode and TortoiseGit) by following Install-inside-MSYS2-proper.
There was just one little stumbling block: one of the keys (@dscho) was not initially trusted. That could be solved by signing the key locally via ´pacman-key --lsign-key <key-id>´.
Don't know if that was a problem only on my installation or on the trust-setting at the repository. Perhaps this info may help others with the same problem, took me some time.

David Macek

@elieux

Did you follow step 2 of the guide, @clunion?

clunion

@clunion

Yes. That step did not work initially (did hang, had to break it after about 20 minutes), i then tried to do the 3 commands step by step, which did not work ether. After some probing i re-initialised the pacman trust-db and did some other steps, until the Step 2 finally worked as shown in the guide. But the key was still not trusted.

David Macek

@elieux

Ah, okay, there seems to be a new key.

David Macek

@elieux

Thanks for the notice.

Page is now updated.

clunion

@clunion

Great, thanks for the quick response!

Yajat Mehta

@yajat2402:matrix.org

[m]

image.png

can anyone help me out with this problem

how to solve it as my program is not executing

David Macek

@elieux

It's not even compiling actually.

It looks like you're missing an entry point. Most often main().

Yajat Mehta

@yajat2402:matrix.org

[m]

image.png

see its not even executing the simplest one

i think there is some issue with mingw but don't know how to fix :(

David Macek

@elieux

I don't see anything wrong with the program.

But you have GCC 6, maybe even a mingw.org toolchain. This is pretty old, so my advice is to use a recent mingw-w64 based toolchain instead.

Andreas Schroeck

@schroeca

I have some issues with my msys2 installation. I can not update the git-for-windows repository. I have tried a lot of different things with the keyring, because it looks like an issue with the key
Is this a known issue? I could not find any help on google

Johannes Schindelin

@dscho

pacman-key --lsign-key E8325679DFFF09668AD8D7B67115A57376871B1C

(see https://github.com/git-for-windows/git/wiki/Install-inside-MSYS2-proper#the-steps)

1 reply

Stephen Lyons

@SlySven

Anyone know who owns the gpg key: 91883E11E83DC29D14104DB4EDD44359093056EE - I am having the same sort of problem as @schroeca but for this key instead:

stephen@Rachel MSYS ~
$ pacman -Syuu
error: git-for-windows-mingw64: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
:: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] y
error: key "91883E11E83DC29D14104DB4EDD44359093056EE" could not be looked up remotely
error: git-for-windows-mingw32: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
:: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] y
error: key "91883E11E83DC29D14104DB4EDD44359093056EE" could not be looked up remotely
:: Synchronizing package databases...
 git-for-windows-mingw64                                   15.7 KiB  10.7 KiB/s 00:01 [################################################] 100%
 git-for-windows-mingw32                                   15.7 KiB  31.4 KiB/s 00:01 [################################################] 100%
 mingw32 is up to date
 mingw64 is up to date
 ucrt64 is up to date
 clang64 is up to date
 msys is up to date
error: git-for-windows-mingw64: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
:: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] n
error: git-for-windows-mingw32: key "91883E11E83DC29D14104DB4EDD44359093056EE" is unknown
:: Import PGP key 91883E11E83DC29D14104DB4EDD44359093056EE? [Y/n] n
error: failed to synchronize all databases (invalid or corrupted database (PGP signature))

stephen@Rachel MSYS ~

Johannes Schindelin

@dscho

It's my GPG key. It's the same as @schroeca reported.

Stephen Lyons

@SlySven

But that is a different one, isn't it:
91883E11E83DC29D14104DB4EDD44359093056EE
verses:
E8325679DFFF09668AD8D7B67115A57376871B1C

Johannes Schindelin

@dscho

The former is a subkey of the latter.

Have you tried following the steps in the linked wiki page?

Stephen Lyons

@SlySven

Ah, one is your signing key and the other your authentication one?

Johannes Schindelin

@dscho

s/authentication/primary/

Stephen Lyons

@SlySven

:stuck_out_tongue_closed_eyes:

David Macek

@elieux

$ gpg --homedir /etc/pacman.d/gnupg/ --with-subkey-fingerprints --list-keys 0x91883E11E83DC29D14104DB4EDD44359093056EE
gpg: Note: trustdb not writable
pub   rsa4096 2021-03-23 [SC] [expires: 2026-03-22]
      E8325679DFFF09668AD8D7B67115A57376871B1C
uid           [ultimate] Johannes Schindelin <johannes.schindelin@gmx.de>
sub   rsa4096 2021-03-23 [E] [expires: 2026-03-22]
      958D57D8AD8823F11D033AAB6D0EA17128B145BC
sub   rsa4096 2021-03-23 [S] [expires: 2026-03-22]
      91883E11E83DC29D14104DB4EDD44359093056EE

Stephen Lyons

@SlySven

AH, RTFM - the wiki step 2 was enough to get things going again...!

Where communities thrive

People

Repo info

Activity