Re: Confusing --graph --all output with detached branches

2016-05-23 Thread Junio C Hamano
Junio C Hamano writes: > Bjørnar Snoksrud writes: > >> .. which indicates that `foo` is contained within `bar`. Maybe >> >> * ff4265f (HEAD -> master) Merge branch 'bar' >> |\ >> | * 0bbc311 (bar) 5 >> | * b1c9c49 4 >> | >> | * ce053f9 (foo) 3 >> |/ >> * 8b62de9 2 >> * cb7e7e2 1 >> >> ..

Re: Confusing --graph --all output with detached branches

2016-05-19 Thread Junio C Hamano
Bjørnar Snoksrud writes: > .. which indicates that `foo` is contained within `bar`. Maybe > > * ff4265f (HEAD -> master) Merge branch 'bar' > |\ > | * 0bbc311 (bar) 5 > | * b1c9c49 4 > | > | * ce053f9 (foo) 3 > |/ > * 8b62de9 2 > * cb7e7e2 1 > > .. would be better? > Yes, it would be. --

Re: Confusing --graph --all output with detached branches

2016-05-19 Thread Junio C Hamano
-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Confusing --graph --all output with detached branches

2016-05-19 Thread Bjørnar Snoksrud
If you end up with a history containing commit A with parent B, where a detached branch is merged into A while an unrelated branch branches off of B, you will get the following output: $ git log --graph --all * commit ff4265fcbfe94a2abe93c97d86e0d9f0e0a136cb |\ Merge: 8b62de9 0bbc311 | | Author