CODEWITHSUNDEEP
gitvisual-studio-codegraphgit-branchgit-commit
Diego L
Diego L

Reputation: 918

How to use git graph in vs code?

I am doing a git course and the git graph extension has been recommended to me. To my colleagues, the extension shows a graph with the different branches as follows:

git_grapg1

But to me all the branches appear in the same line:

git_graph2

I don't understand what I'm doing wrong or how to use the extension. Thank you very much.

Upvotes: 6

Views: 29111

Answers (2)

Chady BAGHDADI
Chady BAGHDADI

Reputation: 303

you can use the --graph option

git log --oneline --all --graph

in vs code you can install the extension : enter image description here

there are two ways to merge:

  • fast forward merge: linear graph
  • three-way merge: commit has diverged from the master

try to use this command when you need to merge the branch in the master => disable fast forward (ff) merge:

git merge --no-ff newBranch

Upvotes: 4

knittl
knittl

Reputation: 265727

Your colleagues' screen shows a real merge commit. Yours seems to be a fast-forward merge. Fast-forward merges are the default when the branches have not diverged. In that case, the branch label can simply be moved to match the other branch's label (i.e. fast-forwarded). Only when branches have diverged, Git must create a merge commit to reconcile the history of both branches.

Upvotes: 2

Related Questions