Questions tagged as 'git'

2
answers

Generate diff patch between two branchs

I have to generate a Patch of the changes I made. The problem is that I have 2 branchs and I have to generate the patch of Branch2 files in relation to Branch1 diff (which is where the original files are). How can I do this?     
asked by 14.01.2015 / 12:49
1
answer

Find commit in which file was deleted

I have a project in Git. I need to recover a file that was deleted several months ago. If something were now in the repository, it would be trivial to find it, see its history and changes. But as it's something that has been removed, I'm havi...
asked by 21.11.2014 / 21:26
2
answers

How to rewind the git command add --all

I ended up using this command unduly, and added many files that I should not, wanted to go back to the previous state, the command git reset HEAD <file> returns only one file, and how many are unfeasible to use it. I added the direc...
asked by 06.12.2018 / 00:58
1
answer

How to see Git statistics with Bitbucket?

I've used GitHub and GitLab for a long time. These platforms are rich in statistics, from user contributions, commits frequency and etc. But now I'm part of a project on Bitbucket , but I did not find any statistics available. Does anyon...
asked by 28.12.2018 / 12:42
1
answer

Problem when merge

I'm doing merges, and in that action, characters with accents are being swapped for symbols, I still do not know what the source of the problem is, if it's the encoding of the files, or if the problem is in git, can someone help me ? Below is an...
asked by 17.05.2018 / 16:22
1
answer

HEAD detached at origin / master

I started studying shortly, Git, and I was creating a branch, but I ended up creating more branch than I wanted. So I was deleting the branch I did not want with the command line: To delete the branch locally: git branch -D <nome do br...
asked by 26.01.2018 / 13:57
1
answer

How to work with conflict management in the merge of branches?

I gave a quick study in git-flow, however, I did not identify how this works the issue of merge conflicts. In an article I read, the author mentioned each collaborator pulling the repository, managing conflicts, and then uploading their code....
asked by 12.03.2018 / 04:16
2
answers

Always ask for password in Git Bash Windows

I would like to know if there is a way for my Git Bash to always ask for my password in Windows. I do not want him to record anything.     
asked by 18.12.2017 / 19:42
1
answer

Problems with git merge

Well, I'm having a problem I've never had before with git .. In our flow we have a branch called DEV that is where all the others leave. And all the completed tasks go through a DEV merge to branch and then a pull request is created for DEV (...
asked by 13.08.2018 / 20:08
1
answer

How can I publish all the git branchs at once to my remote repository in github?

I have several branches that I created in my git (aula1, aula2, aula3) that are variations of the same index.html file, but when I go to github I can only send the master Is there a way to send all the branches at once?     
asked by 06.02.2018 / 11:39