Questions tagged [git]
Git is an open-source distributed version control system (DVCS). Use this tag for questions about Git usage and workflows. Do not use this tag for general programming questions that happen to involve a Git repository. Do not use this tag for GitHub/GitHub Actions questions that do not involve git usage; use [github] or [github-actions] instead. Do not use the [github] tag for Git-related issues just because a repository happens to be hosted on GitHub.
152,994
questions
0
votes
1
answer
16
views
pre-commit won't run stage commit-msg local hooks
I'm having great difficulty making something that seems simple and logical but doesn't work.
As part of a GitHub repository with Python code, I want to manage a pre-commit that will launch a python ...
- 27
0
votes
0
answers
11
views
git diff list of files on github action's PR
When I open a pull request, I have a github action set to trigger a node script:
name: Check i18n tokens 🇮🇹
on:
pull_request:
types: [labeled, unlabeled, opened, synchronize, reopened]
...
- 2,518
0
votes
0
answers
10
views
Git Alias for Powershell Profile Does Not Work [duplicate]
Git commands work on my Powershell and I've verified that my environment variables on Path for Git are correct. My profile looks like this:
oh-my-posh init pwsh --config 'https://raw.githubusercontent....
- 123
0
votes
0
answers
24
views
What does the `foo]` syntax mean for a git option? Or is this `git-clone` Synopsis missing `[`s?
The git-clone doc has the following synopsis
git clone [--template=<template-directory>]
[-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
[-o <name>] [-b <name>] [...
- 841
0
votes
2
answers
27
views
How can you rebase a branch that is tracked remotely?
We've got a development branch, dev1. Starting from that, I create a feature branch, f1 and push to our git server:
git checkout -b f1
git push -u origin f1
I make some changes, commit them and push ...
- 1,434
-1
votes
1
answer
17
views
How to Resolve "Need to specify how to reconcile divergent branches" Error When Rebasing in Git? [duplicate]
I encountered an error while trying to rebase my GitHub project
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following ...
- 1
0
votes
0
answers
22
views
Store multiple repository in the same bare repository
I have a CI/CD with multiple projects (some are (really) big (Go)) and want to reduce bandwith consumption / CPU usage on the server and so I need a cache for git objects on my runner.
But because I ...
- 715
0
votes
1
answer
27
views
Why does `git pull origin master:master` from non-master branch cause branch to be rebased?
I'm on branch master and do git log
commit 9937b91089895fac45a39a3bda2935e19eb42554 (HEAD -> master, origin/master, origin/HEAD)
...
git status prints
On branch master
Your branch is up to date ...
- 841
0
votes
1
answer
19
views
Git - could not resolve host: bitbucket.org - 'dig' command results
While working in WSL and git pull/push to git, I suddenly get the response
ssh: Could not resolve hostname bitbucket.org: Temporary failure in name resolution
fatal: Could not read from remote ...
- 710
-2
votes
0
answers
28
views
Merging feature branch to master branch [closed]
I create a file named course on the master branch and put some text in it and commit after that i created a Branch feature and switch to it and completely change the contetnt of course file and commit....
-1
votes
0
answers
21
views
Xcode pull error .How to recover deleted local code during a pull in Xcode?
How to recover deleted local code during a pull in Xcode? In Xcode, local code that hasn't been submitted or pushed was directly overwritten and deleted after clicking pull. Even the code with ...
- 1
-1
votes
0
answers
17
views
Import correctrly maven project from git
I would like to know what is the most correct method to import a maven project into eclipse downloaded with git clone and avoid the problem with the pom.xml and the related paths.
I hope someone can ...
2
votes
1
answer
26
views
Git rebase multiple commits with multiple branches
I've got a git dag looking something like:
* commit A - main
|
| * commit B - branch1
| |
| * commit C - branch2
| |
| * commit D
|/
* commit E (this is the old main I worked on top of)
I ...
- 809
0
votes
0
answers
27
views
Gitlab Merge Request Strange Behaviour
I have 3 remote branches master, dev and Avi_dev. After completing a feature I want to merge my changes into dev but conflicts appear showing the state of files on dev before I wrote a single line of ...
- 97
0
votes
0
answers
22
views
Bulk add both modified or deleted files separately to index in git
I've normally used git add . which is sufficient most of the time.
But sometime I would like to separately commit deleted or both modified files after manual conflict resolution.
Though git add $file ...
- 363