Category "git"

How to write setup.py to include a Git repository as a dependency

I am trying to write setup.py for my package. My package needs to specify a dependency on another Git repository. This is what I have so far: from setuptools im

Git: How to measure the amount of code changed in a period of time? [duplicate]

I'm looking for a command to execute against my git repo to discover the amount of code changed in a certain period of time. I want to know h

NPM standard-version patch version problem

I'm trying to use standard-version in my javascript project. I added the release script to my package.json: "scripts": { ... "release": "standard-versio

Undo IntelliJ Smart Checkout

IntelliJ has a feature that's very cool in theory, called Smart Checkout. This feature kicks in when you're changing branches and you have files in the current

Git: How to make outer repository and embedded repository work as common/standalone repository?

I have a big project(let's say A repo), and it there one child folder which is come from B repo. I would meet warning like below when I commit from A repo war

Visual Studio showing false errors

I was working on a project, and I usually before doing anything I create new branches. In my feature branch, Visual Studio wasn't showing any errors. It was do

How to make git ignore comments in file?

I have a problem while trying to commit and sometimes a comment have slightly changed in some way (eg different number of spaces like // Text compared //Text).

GitHub "can't automatically merge"?

Sometimes when i try to merge the head fork into my base fork, or my base fork into the head fork, I get the following message on GitHub: "Can’t auto

Git error: Encountered 7 file(s) that should have been pointers, but weren't

How to clean repo, if staged files marked as modified? After git reset --hard I get Encountered 7 file(s) that should have been pointers, but weren't: Running

Differences between git submodule and subtree

What are the conceptual differences between using git submodule and subtree? What are the typical scenarios for each?

How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"

After a git pull origin master, I get the following message: warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squ

How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"

After a git pull origin master, I get the following message: warning: Pulling without specifying how to reconcile divergent branches is discouraged. You can squ

Git mergetool with Meld on Windows

In Linux, my favorite merge tool is Meld, and I've had no problems using or configuring it to work with Git. However, in Windows it has been a different story.

How can I stash only staged changes in Git?

Is there a way I can stash just my staged changes? The scenario I'm having issues with is when I've worked on several bugs at a given time, and have several uns

Using vim as git difftool

I've configured Vim as git difftool in .gitconfig [diff] tool = vimdiff If there are changes in N files, i have to close vim (:qa) to see the next diff.

Visual Studio 2022 git error Unable to negotiate with {0} port {1}: no matching host key type found. Their offer: ssh-rsa

After updating VS 2022 to 17.1.1, I have a problem with Git. I can't comment, for example, fetch or pusl. I get a message Fetching from origin Unable to negoti

git reset asks 'more?'

Git windows command line, version 1.8.0 I have 3 commits so far and when I type git reset --soft HEAD^ new line comes up with More? and flashing cursor f

How to get Jenkins to perform deletes on remote server

I am trying to get started with an automated build process using Jenkins. So far i have managed to get Jenkins to build a project from BitBucket, run tests an

Git on OSX hangs on each command: How to fix it?

I am running mac osx lion. My problem is that git hangs after I type in each command. If i type in git then I get Usage: git credential-osxkeychain <get|s

Git global core.fileMode false overridden locally on clone

Reading this, I was able to configure both globally and locally my fileMode config to false. However, when I git clone, git keeps initializing the projects wit