Questions tagged [git-history-graph]

Git represents history as a directed-acyclic-graph (DAG) of commits, where each commit has at least one parent commit (the exception to this are root commits).

Git represents history as a directed-acyclic-graph (DAG) of commits, where each commit has at least one parent commit (the exception to this are root commits).

There are various tools that allow you to inspect this graph, including:

  • git log
  • git merge-base
33 questions
0
votes
1 answer

Git removing files from history without duplicating pre-branch commits

How I usually proceed: Actually, to remove some files from complete history, I use the following script (which I call git-crunch) : #!/bin/bash # # git crunch # git filter-branch --index-filter "git rm --cached --ignore-unmatch $*" rm…
MensSana
  • 471
  • 1
  • 5
  • 15
-1
votes
2 answers

discarding commits after a successful merge, while keeping the code of the merge commit intact

There are two branches that branched from master : develop, and foo. Both develop and foo diverged from master by several commits. foo has been merged unto develop. Now foo and develop points to the same merge commit, i.e two "streams" of commits…
Vince
  • 3,251
  • 8
  • 28
  • 57
-1
votes
2 answers

git confusing graph. `master` branch seems to have two lines?

On running git log i am seeing strange graph. I will explain it further. Below is the output for git log with graph. $ git log --graph --oneline * df1834d (HEAD -> master, tag: r-0.1, origin/master) Merge branch 'master' of…
samshers
  • 1,269
  • 1
  • 18
  • 39
1 2
3