Tagged Questions
1
vote
1answer
21 views
Copy one git branch with an extra commit to another that is one behind
I have the following git structure (Numbers denote commits):
_ 1 _ 2 _ 3 _ 4 (Branch mainline)
_|
|_ 1 _ 2 _ 3 _ 4 _ 5 (Branch Test)
Thus, Test has one extra commit than mainline does. I ...
2
votes
5answers
286 views
Understanding Git Graphs
I am new to Git and need help understanding Git history graphs, i.e. the relationship between commits and merges as they are displayed on the graph in tools like SmartGit or GitGui. In the image ...
0
votes
2answers
90 views
Git merged branch's last commit/committer
May be its asked already but I couldn't find it in here.
I have a branch FEATURE merged into a branch STABLE and currently when I do git show from STABLE am getting the last commit which is
commit ...
2
votes
1answer
418 views
Are “Merge remote-tracking branch 'xxx/master'” commits a trouble for Pull Request?
There is a Github repository I have forked on which multiple commits where made afterwards.
I wanted these corrections to be part of my forked repository I might have merged them (but can't remember ...
2
votes
3answers
220 views
Is the following Git commit strategy correct?
I've just done the following thing with Git but I am not sure if it's the right way of doing things. What I have is a file that has some stuff. Then there is a branch that adds extra stuff to this ...
3
votes
3answers
620 views
Confusion between merge and commit in Git
I'm a complete newbie to Git, not really sure what's going on. My buddy and I are working on a project together.
I fetched all the files from a remote server git fetch, so I now have a whole bunch ...
0
votes
1answer
756 views
git submodules - another puzzle - reference is not a tree
A developer here ran the steps we recommend for git usage, and has lost a submodule commit. I understand that this error means that she pushed in the super project but not in the submodule, but she ...
2
votes
1answer
352 views
GIT Pull deleted my commit
After git pull I have done git reset hard to undo the merge with commit id before merge.Somehow my entire commit is gone and I cant the see the commit in history also. But I have the commit id , on ...
0
votes
3answers
48 views
Find all commits in a particular branch in GIT
This might be a repeated question but i didn't find exact answers.
Lets say i have 2 branches br1 and br2 with 3 commits each.
br1
commit a
commit b
commit c
br2
commit d
commit e
commit f
...
12
votes
2answers
6k views
Pull in changes from a Github fork
Someone forked a Github project of mine and made some changes. How can I merge the changes back in to my upstream version?
Also, is it possible to pull in just a specific commit?
What I'm looking ...
