Questions tagged [git]
Git is an open source distributed version control system originally designed and written by Linus Torvalds. It is generally used to keep track of source code for software projects. As a DVCS, Git provides powerful help with branching, merging, and distributed development.
2,707
questions
0
votes
1
answer
498
views
I want to install a psql module, but ubuntu cannot find the package?
I wanted to install a postgres module in ubuntu similar to this. So I ran a sudo apt-get update and that ran fine. Next, I did a sudo apt-get install postgresql-9.2-prefix just like the instructions ...
2
votes
0
answers
737
views
Realtime Code Collaboration That is Not Floobits [closed]
So... I love Floobits. I use it in Sublime and I use it in vim. But my network currently does not play nicely with its port requests.
I'm looking for a desktop code collaboration system so that an ...
- 141
14
votes
3
answers
15k
views
How to upgrade to latest git on debian 7?
I have installed git through apt-get on debian 7 which gives me:
# git --version
git version 1.7.10.4
I would like to ugrade to the latests version of git. I have tried:
sudo apt-get install python-...
- 550
1
vote
2
answers
124
views
How to use VCS solutions, like SVN or git, to label the version of particular files?
so I'm starting to use version control systems (VCS) to keep track of my growing piles of code, and am experimenting with SVN and git. The very basic commands are very similar, so I'll just use SVN as ...
- 1,219
1
vote
0
answers
563
views
How do I stop Sublime Text 3 from being the Git editor on Windows?
On Windows 8, I've configured gvim as my Git editor in ~\.gitconfig:
[core]
editor = gvim -f -n
Still, Sublime Text 3 opens as the editor when I invoke git commit. How do I stop Sublime from ...
- 9,408
2
votes
2
answers
2k
views
converting html into word doc or pdf preserving styles (or how to use git for word documents)
So initially I thought maybe it would be good idea to keep the history of changes to my resúmé. I thought: "Source-control! Git!" but then I realized that my resúmé is not a simple .txt file, it's a ...
- 667
5
votes
1
answer
4k
views
Configure Git to use Beyond Compare for image diff
Because we work with a number of sprites, the kind of specialised diff views provided by Beyond Compare would be ideal to see which one of 2 versions I'm after when conflicts arise.
I've already ...
- 330
4
votes
1
answer
31k
views
Can I git clone into a directory without cloning the project name as a directory (using bitbucket)?
I'm a small business and for the most part only use git locally to track history then SFTP the files to the remote server.
I now have a much larger more complicated build that to be set up properly ...
- 143
0
votes
1
answer
360
views
How to set ST2 to prompt me every time whether I want to accept changes in the code made by some other program (git, for example)?
ST2 doesn't ask me if I want it to take new changes in my code. It just quietly reloads my source code. It happens for example when I do git stash or git stash pop. It just changes the code by force ...
- 637
10
votes
1
answer
9k
views
is there a way to check the integrity of a cloned repo.?
I have checked out a remote repo. Now I did some operations of adding some file to the repo. as well as (perhaps) removing some files in the repo. In both the instances git was not informed of the ...
- 459
0
votes
0
answers
264
views
Ask SSH passphrase only once for "chained SSH"
I have a master running Ubuntu and a Slave running Mac OSX 10.6.8. I set up the SSH keys. When connecting to the GIT repo directly from Slave, everything works well and I am not asked to enter a ...
- 141
1
vote
2
answers
2k
views
PATH, resolve location of exe
Consider the following PATH
c:\App1\;c:\App2\
App1 directory contains the application Foo.exe
App2 directory contains the application Bar.exe
Now when I'm in a CMD window I can type either Foo.exe ...
- 75
5
votes
1
answer
6k
views
Timeout with brew update
This is driving me crazy. I can't update my homebrew installation anymore. When I run brew update, it just does nothing and times out.
I even tried reinstalling it, but then I run into the same ...
- 221
6
votes
1
answer
4k
views
Git fails to launch Vim in Cygwin
I have Git working with Vim in a Powershell environment on my work laptop (Windows 7). It pops up Vim when I commit or use my git vimdiff alias.
I have attempted the same setup under Cygwin (being a ...
- 3,469
2
votes
3
answers
143
views
Large file editing and versioning for non-programmers [closed]
As part of a collaborative Creative Commons project, I would like to allow editors to contribute by editing a relatively large text file: ~8 Mb, ~100k lines. Ideally, contributions would be git pull ...
- 139
2
votes
2
answers
958
views
Installing Git on Windows
I've installed several different versions of Git on Windows all with the same failure. I get an error "libssh2.dll is not installed on this computer...".
I looked around the installation files, and, ...
- 883
1
vote
1
answer
2k
views
How can I recreate my git directory and working tree?
My hard drive failed. No backups. (I know. I know.)
Managed to clone the drive and recover most lost data. However, files and directories which were prefixed with dot (or blob) are now without their ...
- 13
1
vote
1
answer
335
views
Understanding a Git repo
I recently inherited a project that was setup to use Git and bitbucket.org and I need some clarification on how the workflow moves. My setup is as follows:
my Drupal site is stored on Bitbucket.
I ...
- 135
1
vote
1
answer
318
views
Easiest way to fork a nonGitHub git repo to a GitHub repo?
For example, I'd like to fork a GNU Savannah git repo, and use GitHub's pull request button to signal GNU Savannah that I'd like to submit a patch. Is this possible?
- 361
0
votes
2
answers
1k
views
Uninstalling Homebrew messed up git
I uninstalled Homebrew using https://superuser.com/a/203740.
After running the above commands, I can't find .bashrc and .bash_profle. All files are gone from Documents , Desktop and Downloads :'(
...
- 101
0
votes
0
answers
47
views
Uninstalling Homebrew messed up git [duplicate]
I uninstalled Homebrew using https://superuser.com/a/203740.
After running the above commands, I can't find .bashrc and .bash_profle.
When I do git status on /Users/ava it shows:
# On branch master
...
- 101
2
votes
0
answers
5k
views
Mac OS X: "A keychain cannot be found to store [credentials]"
I'm trying to use git with a remote repo over the command line in OS X 10.8.4. When I enter my credentials for GitHub every time I perform a git push -u origin master, I get a system saying "A ...
- 698
0
votes
1
answer
263
views
How to perform :DiffOrig against the commted file
VIM has a terrific :DiffOrig command to diff the file in the buffer with the file on the disk. How might one diff against the file in Git (as would be returned with a git checkout command) instead of ...
- 11.5k
2
votes
2
answers
2k
views
how to get git on solaris webspace?
I'm renting webspace with SSH access and I want to host a GIT repository on it. The problem is that GIT is not installed on the server, which is running Solaris and therefor it is difficult for me to ...
- 203
0
votes
1
answer
531
views
How should i separate branches for live project in git
Initially i was in a team where we have one project and all other have separate bracnhes. I didn't knew much git but picked up in small time just doing basic things.
Now all other members have moved ...
- 121
0
votes
3
answers
198
views
Using git to take over the management of half synchronized text file directories
This is a problem that hard to describe (and of course hard to search for answer), the closest that I found is
Moving two existing already-synced directory trees to git annex
I have two copies of my ...
- 8,681
30
votes
3
answers
5k
views
Is there a git-like file system?
Git stores content uniquely in its repo based on the calculated hash of any file. If my directory has two copies of the same file somewhere inside it, git will only actually store it once.
I am ...
- 467
4
votes
3
answers
11k
views
How to auto commit to my git repository using cron?
I look into a lot of answers about this subject, but something is wrong here, let me explain.
I create this script, to make my cron cleaner :)
#!/bin/bash
cd /home/valter.silva/Development/git/...
- 1,381
1
vote
2
answers
1k
views
7zip is incompatible with tar format created by git archive
% git archive --format tar master > archive.tar
% file archive.tar
archive.tar: POSIX tar archive
% tar cf a.tar archive.tar
% file a.tar
a.tar: POSIX tar archive (GNU)
7zip cannot unpack tar ...
- 759
0
votes
1
answer
830
views
How to find the age of a remote branch without fetching the origin
How to delete a branch older than 30 days on remote without fetching the entire repo
i= remote branch name
if [ -n "$(git log -1 --since='30 days' -s $i)" ]; then
git push origin :$i
echo " ...
0
votes
2
answers
835
views
Can I use one local git repo as client/server?
We have git repo remotely located and local connection is very slow. Syncing 1 GB of data for every user is a painful job. Is it possible to setup one git locally to which all local users can sync and ...
- 1,422
9
votes
3
answers
17k
views
Windows is saying access denied to files I own
So, recently Windows has decided to do some trolling on me and make it impossible to commit to my git repository
It gives me this error in git (in Cygwin):
$ git commit -a
error: insufficient ...
- 4,494
6
votes
2
answers
7k
views
Why can't I install Git for Windows with OpenSSH?
Whenever I try to install Git for Windows, using the installer downloaded from here, the installation seemingly skips the step where I configure my Secure Shell client for Git.
Normally during ...
- 187
0
votes
0
answers
371
views
Issue committing files using GitHub app
I've been using the GitHub app for a while now, and recently it's given me some problems. My most recent problem has me up the wall. Here's what happened.
I noticed that some of my files were messed ...
- 101
1
vote
1
answer
9k
views
Can't authenticate with git
I'm trying to publish changes to a project in GitHub, but I keep getting this authentication error:
root@nodeTwo:/usr/local/src/cedit-dev# git push origin master
Username for 'http://www.github.com': ...
- 533
4
votes
3
answers
2k
views
Making MacVim/gVim “block” the terminal until closed
A long time ago, before I switched to vims, I used an editor for OS X known as TextMate. (Anyone remember that? ;)
Its command-line binary, mate, allowed for a mate -w flag, which would block the ...
- 2,475
0
votes
2
answers
410
views
how to sync localhost and VPS
I'm a web geek and totally new to server side Fields.Our University have over 40 branches within the country and we now going to have a web based system to dealing with student registration,payments,...
- 101
7
votes
3
answers
5k
views
How do I add a parent commit before all other commits in Git?
I am in a situation where I am trying to convert an open source project to Git, and I have recently gained access to historical data for the project. I have already made modifications to the repo, ...
- 175
0
votes
3
answers
343
views
How to easily write a website using a text editor and version control? [closed]
Question
I would like to write a website with nice design, say like the ones generated by WordPress, SPIP or with advanced CSS-based templates. At the same time, I would like to write the contents in ...
- 121
4
votes
1
answer
1k
views
Setting TextMate 2 as Git's difftool
Is it possible to set TextMate 2 as the default Git difftool/mergetool?
If so, what are the commands?
I have found instructions for the diffmerge tool here, but I would like to try it with text mate,...
- 1,080
0
votes
1
answer
2k
views
Unable to update Eclipse because of a conflicting dependency with git/egit
Can anyone advise on how to resolve this?
Cannot complete the install because of a conflicting dependency. Software being installed: Eclipse Git Team Provider
3.0.1.201307141637-r (org.eclipse.egit....
- 157
6
votes
1
answer
7k
views
Stop Thumbs.db files in certain folders
I'm a big fan of folder+file thumbnailing, so I'm all for thumbs.db files.
However, I'm working on a Git project, so every time I commit my git folder to the online repository, some thumbs.db files ...
- 1,404
3
votes
2
answers
4k
views
How to update Git on Mac OS X from system default to latest
How do I update or upgrade Git (1.7.12.4) to the latest version 1.8.3.4 on OS X (10.8.3)?
I downloaded Git from git-scm.com and installed it. But it didn't use the latest version that I installed – ...
0
votes
1
answer
238
views
tarballing a git branch to a remote server using a sudoer
I have this compound command working for the root user and have been jumping through hoops trying to get it to work for a sudoer (rsa keys, echoing the pwd, supressing tty etc) but I can't seem to get ...
23
votes
3
answers
23k
views
Checkout Git files to a location outside the repository
Is it possible to “checkout” to a location outside of the repository? What I mean is a clone of a branch without the “.git” directory.
For example: Use git to manage a website. You edit some files, ...
- 331
4
votes
2
answers
4k
views
How to get git flow completions for zsh working?
I have git and git-flow installed via Homebrew. I am on a Mac.
I have zsh 5.0.2 (x86_64-apple-darwin12.4.0)
git completions are working. git-flow completions are not.
I cannot get git flow ...
- 2,281
0
votes
0
answers
95
views
Can gitlab be installed with Cherokee web server?
I've looked all over and can't figure out you could use Cherokee instead of Apache or Nginx for gitlab. I'd rather not run multiple webservers (and imagine that they could conflict anyway). I'm giving ...
21
votes
4
answers
40k
views
how to pull into multiple branches at once with git?
In a repo I have multiple branches, among them "master" and "develop", which are set up to track remote branches "origin/master" and "origin/develop".
Is it possible to specify that I want both ...
- 1,749
4
votes
1
answer
218
views
Ubuntu insists on installing git 1.7
I had Ubuntu 12.04 LTS and I recently upgraded to 12.10.
Though I already have git 1.8 installed, update-manager keeps trying to install git and git-man version 1.7 (which obviously fails)!
Any idea ...
- 150
7
votes
1
answer
3k
views
Emacs as git editor, what is Rebase mode?
When I run git rebase -i I get the absolutely horrible Rebase mode in emacs.
This only accepts some pre defined commads like
c -> Pick
r -> Reword
etc...
Even if I change to text mode emacs auto-...
- 137