Tagged Questions

Git is an open-source DVCS (Distributed Version Control System).

learn more… | top users | synonyms

2
votes
2answers
463 views

How to exclude certain directories/files from git grep search

Is there a way to search git repository using git grep but exclude certain paths/directories/files from the search? Like the --exclude option in normal grep command. If you are curious: I don't want ...
2
votes
1answer
156 views

XCode duplicates my repository and renames its location with lowercase

I have a Git repository where my project is linked to. It is located somewhere like /Users/a/Documents/Xcode Projects/MyProject. I use Xcode UI to commit changes and it worked perfectly for a couple ...
0
votes
1answer
23 views

Git and Obfuscated Code

I've been working on an idea, and needed to run it past someone to see if I'd gone off the deep end. I'm working on a decently complex PHP project, I am the only developer. We're looking to hire ...
1
vote
1answer
14 views

Is there a way to test if a file is GPG encrypted in a git hook?

I have a git repository that tracks a couple config files. One of the config files is plain text, while the other is gpg encrypted. They are named as such. myconfig.yaml myconfig.yaml.gpg I ...
2
votes
1answer
49 views

Are git repository names case sensitive?

I realize that changing the name of a git repo is not a trivial task, and I read the answer to this question which describes how to change the repo name in the general case (I am also using GitHub). ...
0
votes
0answers
15 views

How to revert a merge which used strategy=ours?

I'm working with a repository where a merge was performed weeks ago which we just discovered used the --strategy=ours flag (it was supposed to use the --strategy-option=ours flag), thus not applying ...
86
votes
14answers
31k views

Pushing to Git returning Error Code 403 fatal: HTTP request failed

I was able to clone a copy of this repo over HTTPS authenticated. I've made some commits and want to push back out to the GitHub server. Using Cygwin on Windows 7 x64. ...
0
votes
0answers
17 views

Git rebase could not be done

I am trying to rebase a branch. I did git rebase -i master and picked the commits. After that I got the following error: Could not apply 0c23308... Make footer sticky again. I cant see any ...
0
votes
1answer
27 views

how can I ignore comments in a 3-way merge?

So I've got the following repo: n1 -> n2 -> n3 -> master and n2 -> n4 I want to merge n4 back into master using git, so AFIAK: BASE = n2, LOCAL = n3, REMOTE = n4, and MERGED = master I'm using ...
12
votes
2answers
3k views

git add . vs git commit -a

What's the difference between: git add . git commit -a Should I be doing both, or is that redundant?
0
votes
0answers
32 views

How to know list of all the files changed in a git workspace

Following is my git workflow which I plan to automate Clone to an external project Cherry-pick a list of gerrits, once cherypicked these automatically get commited if cherrypick is successful Now ...
2
votes
3answers
31 views

Is this a good strategy to undo git stuff?

Until now, if I ever commited and pushed something wrong to the master branch, my way of solving it was, assume the the git log looks like commit bad_hash commit another_bad_hash commit ...
2
votes
2answers
433 views

Proper way to use git for website development?

So I have searched around this site, I have read the tutorial at gitimmersion.com, and various others as well, but I still have lingering questions which I am hoping someone can answer. Basically I ...
1
vote
0answers
13 views

Merge error after converting Git submodule to subtree

I have a project where I was originally using submodules for some dependent code. It turns out that submodules are not really appropriate for this project (and they are hard to use in practice), so I ...
0
votes
0answers
11 views

Sublime/Git is adding and removing blank lines in commits

When I edit a single line in a file either sublime or git adds then removes many of the other (mostly blank) lines in the file. Here is an example of this @@ -1,7 +1,7 @@ module UserHelper - + ...

1 2 3 4 5 … 1514
15 30 50 per page