Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency.
0
votes
0answers
7 views
How to use git merge drivers with Jenkins
I recently searched for a way to merge pom.xml-s automatically with git merge driver. Got it working locally but now i'd like to add this solution to Jenkins, no luck so far.
What i did:
1) I added ...
0
votes
1answer
14 views
Arch linux ca-certificates.crt not found
I have a problem with the certificates in Arch linux. It seems that it can't find ca-certificates.crt. I have updated my system and installed the ca-certificates{,-utils,-mozilla} packages and it ...
1
vote
0answers
10 views
Git-annex auto merge symbolic links?
Is it possible to merge two same file automatically?
For example, fileA and fileB are two same files. However, fileA is on PC and fileB is on Laptop. If I run git annex import /path/to/fileA and ...
4
votes
1answer
18 views
Specify submodule revision in PKGBUILD
I'm trying to install hhvm-git package from AUR and getting an error. There is a bug in one of submodules. This bug is fixed already and I want to specify revision contains that fix for the submodule. ...
3
votes
1answer
15 views
How to make clean commits with etckeeper?
I would like to make clean commits with etckeeper. Here is what happens:
1) Check the status of the repository :
git status
On branch master
nothing to commit, working directory clean
2) Modify a ...
0
votes
0answers
10 views
Is there a dockersh like gitsh?
I quite like git-shell. When I have several operations to do with git it saves some typing.
Is there any similar effort for docker ?
1
vote
1answer
18 views
Print just git commit sha and a pattern using sed
I'm running from the terminal in OSX, and given a git log format like:
* 58dbb08 Joe Blogs 5 weeks ago | [ABC-123] Commit message contents
* 5a9c5e1 Jane Doe 3 weeks ago | Commit Contents with XYZ-...
0
votes
0answers
27 views
Installing Git on a shared hosting - libiconv library & './configure: Permission denied' [on hold]
I'm trying to install git using this guide, but i get this error:
[benmoto@s22 src2]$ cd git-2.10.2
[benmoto@s22 git-2.10.2]$ make
LINK git-credential-store
libgit.a(utf8.o): In function `...
4
votes
1answer
40 views
how to set up username and passwords for different git repos?
─[$] cat ~/.gitconfig
[user]
name = Shirish Agarwal
email = [email protected]
[core]
editor = leafpad
excludesfiles = /home/shirish/.gitignore
gitproxy = \"ssh\" for gitorious.org
[...
3
votes
2answers
34 views
git: how to add one file as a version of another?
I have a bash script that I've written during the course of the last week. Today, I've decided to finally give git a try before making any further changes, created a git repository, etc.
The script ...
1
vote
2answers
20 views
where is the 'Editor' variable kept in git?
I cloned a repo (using fictious examples here)
$ git clone http://someplace.somedomain.name/resource.git
went to the directory
$ cd resource
and then tried to edit a file within the resource ...
1
vote
0answers
21 views
generating git commit info with rubber (for LaTeX, Debian)
I'm using the rubber program (in Python, from Lauchpad) to process a LaTeX document (thru pdflatex called by rubber -d) on Debian/Sid/Linux (the document is some H2020 European R&D proposal). I ...
0
votes
1answer
20 views
Re- Setup git-svn repository in Mac after a cleanup
I need help in re- setting up a password protected, project repository in my Mac OS X after it was wiped due to hardware issues.
I followed these steps
Installed the Xcode Command Line version
...
4
votes
2answers
77 views
How to find all git repositories within given folders (fast)
Naive approach is find dir1 dir2 dir3 -type d -name .git | xargs -I {} dirname {}
, but it's too slow for me, because I have a lot deep folder structures inside git repositories (at least I think that ...
3
votes
1answer
23 views
Git command to strip multiple removed lines from the commits that originally added them
After I remove several lines from a git-versioned file, instead of making a new commit that removes those lines, is there a git command(s) that just strips those lines from the commits that originally ...
1
vote
2answers
99 views
Unmet dependencies while installing Git on Debian
I am attempting to install git on Debian 8.6 Jessie and have run into some dependency issues. What's odd is that I didn't have any issues the few times I recently installed Git in a VM while I was ...
0
votes
2answers
29 views
Save into file git fetch terminal output
I have tried several ways to save into a log file 'git fetch output' from terminal, through a bash file but without success, like,
git fetch origin > output.log
or even adding output.log in the ...
1
vote
0answers
37 views
git ssh alias not working unless I add the key to ssh-agent (OSX)
I added a ssh alias to use a different key-pair for a certain domain. The key does not have a passphrase. I had followed the directions at https://confluence.atlassian.com/bitbucket/configure-...
2
votes
1answer
50 views
How to use “less -F” without “-X”, but still display output if only one page?
I'm tweaking the pager of Git, but I've got some issues with it.
What I want is:
Always colored output
Scrolling by touchpad or mouse
Quit-if-one-screen
And my current configuration is:
$ git ...
1
vote
1answer
31 views
Sudo-like utility for ssh, or at least git in particular?
I'd like to keep my keys secure, but also not have to enter a passphrase on every single git invocation, when I want to run several commands in quick succession. I've researched this, and found that ...
0
votes
1answer
15 views
Restore files from external USB after deleting .git [closed]
I have 20 years of work on my USB. After deleting .git files. I ran this command in the terminal:
sudo find . | grep .git | xargs rm -rf
I lost all folders and files.
When I look in Finder I was ...
1
vote
0answers
26 views
Git-annex link to different file names
Maybe this is just a crazy use case that doesn't work, but I was wondering if there's a way to build a file's history from files with different file names. I'm exploring this idea because I'd like to ...
0
votes
2answers
40 views
Understanding what git branch means, in this context
I'm trying to understand what does this code means:
function git_branch {
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \1/'
}
but I don't get it. Someone said this ...
3
votes
1answer
85 views
I have nested git repos, will it cause a problem?
A history
I installed etckeeper
I decided to track e.g. shorewall firewall configuration as its own git repository. I think I wanted it to be easier to look at specific configuration changes. I ...
4
votes
4answers
67 views
List files not stored in Git repos
I want to find out what files in a certain directory are not managed by Git. This is so I because I use Git for backups, and I want to eventually get all my files personal in there.
What unix tool ...
0
votes
0answers
23 views
automatic create directory “git-shell-commands” in home directory when login to git-shell
I want to create directory "git-shell-commands" in home directory when login to git-shell
I need to user in Active Directory to use git-shell.
Now AD user can login to FreeBSD (Samba 4.4 + winbindd +...
4
votes
2answers
64 views
Add file outside git repository [closed]
Assume I have local workstation with root access and a server without root access. I want to share (mostly configuration) files between these two computers. So I set up a git repository with top-level ...
1
vote
1answer
33 views
“not regular file” when trying to scp .gitignore file [closed]
The remote directory already contains a .gitignore file, which I want to overwrite and upload a new one. After doing:
scp -P[portnumber] [email protected]:path/for/file/ location/of/file/.gitignore
I ...
1
vote
0answers
29 views
How to store different username-password key pair in SSH in GIT Bash?
Current Machine: Git Bash on Windows.
Trying to connect to a Mac through SSH.
When I execute the below command:
ssh [email protected] "ls"
Password: <myPassword>
Output (works as desired)...
1
vote
3answers
44 views
Run git fetch after any cd command
I need to run git fetch after any cd command in the background and only if I'm in a git directory.
I'm horrible at zsh/bash scripting and could use some help with this
0
votes
0answers
11 views
no gitlab connection possible, mac osx wifi git clone from gitlab stuck
I have a macbook mid 2009 running El Capitan and git client installed and properly working, I also have a Server running gitlab and it is also working pretty good. I have a normal wifi connection. ...
1
vote
1answer
41 views
Git Server: ignore whitespace changes in new commits
I found a lot of ways to deal with the whitespace problem in Git, but all of them require some sort of action on the user side: configure Git to ignore ws changes, setup a pre-commit hook with warning,...
1
vote
1answer
40 views
How to prevent `git difftool` from calling another `vimdiff`?
I have git configured (like below) to use vimdiff as difftool and compare another pair of files without prompting as soon as I call :qa. It's awesome. The only problem is sometimes there are ...
3
votes
1answer
29 views
Storing git results in a variable results in weird behaviour [duplicate]
I have a git repository with 2 branches:
$ git branch
* master
test/branch
I can list specific branches individually by doing the following:
$ git branch --list master
* master
$ git branch --...
1
vote
2answers
109 views
Dealing with machine specific configs when using git for configuration management
I've been using a git repo for managing my systems configs for a while now. I used the documentation on Digital Ocean tutorials here. Pretty much I have a remote repo on a server. Do a git clone of ...
0
votes
1answer
55 views
bash if condition on git command result
I have the following error due an invalid git command within my shell-script. git push blabla master results in fatal: 'blabla' does not appear to be a git repository
I would like to respond to ...
0
votes
0answers
23 views
Cause of git error - Insufficient permission for adding an object to repository database ./objects? [duplicate]
I'm skeptical about this error and want to share one cause. PLease share your views on whether it could be a reason for above mentioned error.
Scenario 1:-
i). I have cloned a local git repo which ...
0
votes
1answer
8 views
Remove all objects in repo but specified object
I'm trying to write a program that will get an object from github, without cloning the entire repo. The last line does not work, giving me
a Syntax error: "(" unexpected. It is supposed to remove ...
1
vote
2answers
31 views
Git - Remove file from two branches
I have two branches, which contain a file that has recently been added to git ignore. It is an auto-generated file. I removed it in the master branch from the cache using git rm --cached fileName. ...
1
vote
1answer
30 views
Git tracking dotfiles that are symlinked
I keep my dotfiles in a private git repo on bitbucket and this works great for the majority of my files (.vimrc, .tmux.conf etc) then I just set up symlinks from my home directory to my cloned gitrepo ...
1
vote
0answers
84 views
What is return code 1 for git-rebase? What are other values it could return?
I've got a script that takes changes from master and applies them to all branches. The script works well for us because we tag our releases and use dev-branches. We don't maintain a separate branch ...
1
vote
1answer
105 views
RepoForge used across many StackOverflow docs is down, What is the alternative?
I'm trying to download git. I could build from source except I have no source packages.
I tried yum install git but that couldn't find it.
I tried downloading the git rpm directly from Repoforge , ...
2
votes
0answers
77 views
Git Server with several repos
I'm setting up a Git server, and there will be three different groups working on different projects iOS, WebDevel, Android. I need to do it in a secure/safe way.
Meanwhile, I don't want iOS ...
2
votes
1answer
39 views
Merging part of kernel - best way?
For example: I have a kernel 3.16 from my embedded support, but I want to have some network wireless drivers from 3.19. What is the best way to merge only this drivers (not full kernel)?
I tried ...
1
vote
1answer
86 views
Checking for errors in bash script
How can I modified this script to conditionally execute ${deleteOldBranchRemote} when there is no error executing ${getRename}?
Now_hourly=$(date +%d%b%H%M)
#echo "$Now_hourly"
newrcName="rc$...
1
vote
1answer
29 views
Bash command inside .gitconfig file
I have a string (Github token) inside a file and I want this to be accessible via gitconfig only after I enter my keyring password.
For this I created a file /secret/token, and then chmod it to 400. ...
1
vote
1answer
66 views
Colored word-diff just like git's?
I've been for long using git's (colored) --word-diff which I find awesome. I found myself today in a situation where I had two strings I needed to compare word by word and craving for something just ...
1
vote
1answer
87 views
How to install custom source from git using my package manager in Gentoo?
I would like to install custom source from a git repository, but using my package manager (emerge for portage).
Background
I have installed Gentoo using EFI using Sakaki's tutorial, so I have ...
1
vote
0answers
20 views
How to handle multi-machine-dot-file-versioning
I'm thinking about versioning my dot-files via git on a public repository. I've moved all the interesting dot-files like .profiles or .vimrc to the repository and subsequently symlinked them to there ...
1
vote
2answers
131 views
git not using global config file or public key
I've setup a global git username and password while logged in as root on my Fedora server with the following commands:
git config --global user.email "[my email]"
git config --global user.name "[my ...
