Where communities thrive


  • Join over 1.5M+ people
  • Join over 100K+ communities
  • Free without limits
  • Create your own community
People
Repo info
Activity
    Brent Arias
    @brentarias
    New question. How is this possible?
    image.png
    It says I'm behind by one...but when I try to pull...it says I'm up to date.
    David Macek
    @elieux
    I'm not actually sure what exactly is up to date there, but it sure looks suspicious.
    Johannes Schindelin
    @dscho
    I bet there's a hook at work. Running this using GIT_TRACE=1 might shed some light into the puzzle.
    Johannes Schindelin
    @dscho
    Funnily enough, I just wrote an MCVE for a different issue, and ran into this error message. Here is the MCVE: https://github.com/git-for-windows/git/issues/3192#issuecomment-825549677. The message seems to stem from https://github.com/git/git/blob/v2.31.1/merge-recursive.c#L3434-L3435, where it essentially says that the tree did not have to be changed (because HEAD, MERGE_HEAD as well as the merge base essentially refer to the empty tree as far as merge-recursive is concerned). So I'd look into that, if I were you, and if you find a good way to reproduce this, report it to the Git mailing list at git@vger.kernel.org (because this is not a Windows-specific issue; please do make sure not to write any HTML mail, as they bounce, by design).
    Mayank Aggarwal
    @Mayank0255

    Hello everyone

    I am Mayank Aggarwal, a 3rd year student pursuing Btech in Information Technology from Manipal University Jaipur.

    I am here to grow as a developer with a set of like minded people

    Check me out at

    Portfolio: https://mayank0255.github.io/
    GitHub: https://github.com/Mayank0255
    Linkedin: https://www.linkedin.com/in/mayank-aggarwal-14301b168

    Rahul Awasthi
    @RahulAwasthi314
    how can I push my local git repository to github?
    David Macek
    @elieux
    Did you try GitHub help pages?
    Rahul Awasthi
    @RahulAwasthi314
    Yes I resolved the issue now. Thanks for help
    Brent Arias
    @brentarias
    I have a git repo, with a git submodule, that has a merge conflict I don't know how to resolve:
    image.png
    Normally when there is a file conflict, I'm given the choice between "accept current" or "accept incoming". In this case I'm not given any option...nor a notation that makes sense to me. Ideas?
    Brent Arias
    @brentarias
    The only clue I have is that git status gives the following information:
    Unmerged paths:
      (use "git add <file>..." to mark resolution)
            both modified:   External/NeoAgent/Extractor
    Brent Arias
    @brentarias
    Ok, based on a Stackoverflow answer(s) I found, I tried a solution which seems to have worked:
    git reset HEAD External/NeoAgent/Extractor
    Ivan Shapovalov
    @intelfx:intelfx.name
    [m]
    Hey.
    I have a question about the git-for-windows installation process into an existing msys2 copy from this wiki page.
    Do I have to install git-extra? What exactly am I losing by not installing it? It seems to convert my msys2 installation into a git-for-windows sdk, and this process goes not very smoothly (e. g. it makes msys2 spit out a bunch of errors whenever I launch a shell).
    (I was told to ping elieux (David Macek))
    David Macek
    @elieux
    Hey.
    I can try to write down what it does in detail. But a quick and unverified answer would be "no, you don't have to".
    David Macek
    @elieux
    @intelfx:intelfx.name It's done.
    I've been running without git-extra for quite some time and it doesn't seem to affect my basic usage of Git.
    Ivan Shapovalov
    @intelfx:intelfx.name
    [m]
    @elieux: thanks for writing this up!
    Johannes Schindelin
    @dscho
    Maybe worth mentioning: keeping MSYS2's version of the msys2-runtime will not allow Git's test suite to pass.
    David Macek
    @elieux
    I know that and it's mentioned in the linked issue, but I don't think this exact information is directly useful to users.
    Eep, what happened?
    David Macek
    @elieux
    Nevermind, the above link just unexpectedly leads to a different page than I expected.
    The wording could make it more obvious that there are known issues. I'll try to reword it when I get to work.
    David Macek
    @elieux
    I changed it, please review.
    Robert-Cheetham
    @Robert-Cheetham
    Hi, I'm new here and am trying to get the git extension to work. Specifically when I right click in a folder with a .git folder I expect to see the Git extensions. I see none of them. Any idea what I'm doing wrong. I have installed the package twice and rebooted the computer.
    Balazs Varnai
    @bvarnai
    Hello, I would like to add more to tools like rsync, jq etc. and create an in-house version with installer. Could you help me how the msys2 packages get included? Thx!
    Johannes Schindelin
    @dscho
    You're largely on your own there...
    Having said that, it is relatively easy once you familiarize yourself with the way Git for Windows' installers are built.
    (this is what sdk build installer runs)
    Note how it calls make-file-list.sh to generate the list of files to include: https://github.com/git-for-windows/build-extra/blob/bbab27c58d3da1887084311597ecc68d6cb041b0/installer/release.sh#L162
    This script essentially asks pacman to enumerate package contents, and then filters out known-unnecessary files: https://github.com/git-for-windows/build-extra/blob/HEAD/make-file-list.sh
    You will also note that this script takes an arbitrary number of extra package names to include: https://github.com/git-for-windows/build-extra/blob/bbab27c58d3da1887084311597ecc68d6cb041b0/make-file-list.sh#L123
    If you hack release.sh to pass those extra package names to make-file-list.sh, you should be set.
    Just don't ask me to support your use case :grinning:
    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
    hi
    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 :)