153,633 questions
Score of -5
0 answers
102 views
How to detect which files were conflict-resolved in a git merge commit?
I need to monitor several repositories and, whenever someone merges any branch into any other branch, email the person who performed the merge along with the list of files that had conflicts.
Score of 1
0 answers
74 views
Removing an unwanted file from Git with a downstream branch
I work on a couple of Git repositories with two branches work and main. Changes are worked on in work and eventually cherry-picked into main, when approved.
At some point several commits ago, a very ...
Score of -2
0 answers
46 views
Azure DevOps Push API : max file changes per push?
I'm migrating a large historical archive into an Azure DevOps Git repository using the REST
Each push contains a single commit whose changes array holds multiple file add/edit operations, with file ...
Score of -6
1 answer
117 views
Since what version of git does pull ff-only?
I can see in current git docs that ff-only is now default behavior for git pull. What version introduced this change? As I recall, git would just happily merge in more complicated scenarios before. I ...
Score of 0
1 answer
115 views
Untracked files that should match gitignore are showing up for git status
I'm setting up a new git repo to test things out before transferring over a large project from SVN. I've got nearly everything working except for the .gitignore. I currently have it so the only ...
Score of 1
2 answers
146 views
Check out a branch without populating worktree?
In a repo-construction script I'm writing, I have a need to check out a branch so that I get that branch's index file, but I have no need for the working files. In my situation, populating the ...
Score of 3
1 answer
91 views
Right way to update branch after git commit-tree
I am doing some low-level repo construction for which git commit-tree appears to be the right tool for the job. (Specifically, I am constructing merge commits "by hand", with merged working ...
Score of -4
0 answers
88 views
How to know on which SHA1 a submodule should be [duplicate]
I had to manipulate submodules quite recently and I faced issues where the HEAD of my submodule was not pointing where it should.
According the man page, a git checkout does not update the HEAD of a ...
Score of -2
0 answers
109 views
How to undo "git cherry-pick --continue"
I git cherry-pick and have a conflict.
I resolve the conflict and stage the changes.
I git cherry-pick --continue and successfully commit.
How do I undo ONLY the git cherry-pick --continue to get back ...
Score of 0
1 answer
98 views
git fetch --shallow-exclude broken for non-linear history?
The documentation for --shallow-exclude says:
Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag.
So given a repository like:
...
Score of -3
0 answers
146 views
GitHub commit page only renders 2–3 changed files or none, but git show and .patch contains the full diff [closed]
I'm seeing a strange issue with GitHub's commit viewer. On the GitHub commit page, the left sidebar correctly lists the changed files, but the diff panel only renders a few files (sometimes 2–3) or is ...
Score of -1
1 answer
97 views
Enforce git fetch enforce automatic tag following
I want to use git fetch with automatic tag following in a script regardless the user config setting. See https://linux.die.net/man/1/git-fetch :
When <refspec> stores the fetched result in ...
Score of 0
0 answers
113 views
How to use Jetty as a Git server with the Smart HTTP protocol?
The Git documentation mentions a way of configuring a Git server with the Smart HTTP protocol and the Apache HTTP server, it relies on a CGI script provided with Git called git-http-backend on the ...
Advice
0
votes
9
replies
145
views
What is the technical description/meaning of the term 'snapshot' (regarding Git)?
Mr. Old School here not used to slang language in 'technical' books like Pro Git. What exactly is a snapshot in the context of Git? Sounds like a cell phone picture. Pls pardon my ignorance.
Score of -2
1 answer
165 views
Git clone thinks a utf16 file is utf8
I was trying to download Microsoft/Windows-driver-samples. It errors out on .inf files that are marked as UTF16 in .gitattributes
It tries to encode the text into UTF16 from UTF8 as if it were UTF8.
...