Geek Answers Handbook

Git Fix Order after Merge

I am trying to use the branching model as described in the following article: http://nvie.com/posts/a-successful-git-branching-model/

  • I created a new branch called elements from the wizard, made several commits there
  • He returned to the master of the branch and made one latch
  • git merge --no-ff branch element, then resolve merge conflicts

I assumed that all merged commits from another branch would be merged in order, however this does not look like this. The following is the conclusion git log:

f28e150 Merge branch 'items'
8281666 [Master] Another middle commit before merge
73d0ca9 [items] commit 2
0442978 [items] commit 1

Why are the first two commits of an item branch displayed in front of the main branch? Wouldn't it make sense to show them together under a merge commit, since this is when I combined all this with my code?

Call graph option: git log --graphshows it in the correct order

*   f28e150 Merge branch 'items'
|\  
| * 73d0ca9 [items] commit 2
| * 0442978 [items] commit 1
* | 8281666 [Master] Another middle commit before merge
|/

, , , -

+4
1

: git log , , . ( , : / , git log .)

git log, ; commit ordering ( ).

" " - ( Git), , , Git. , --graph --topo-order, --topo-order , .

, , , --first-parent. . --first-parent , , , , "-", . . GIT: foxtrot master?

+8

More articles:


All Articles