]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 82fa169 8d049e1)
Merge branch 'ds/revision-show-pulls'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:57 +0000 (13:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2020 20:42:57 +0000 (13:42 -0700)
commit9af3a7cb4d6d2aa7807b1f0d0e5b5b8605177413
tree3659dd767c0cbe16b12241b8dbfe060c89007d25tree | snapshot
parent82fa169d551d71fd21d8a6368040e19d209f79abcommit | diff
parent8d049e182e2e213a012e2d6839becfe0e2de79dbcommit | diff
Merge branch 'ds/revision-show-pulls'

"git log" learned "--show-pulls" that helps pathspec limited
history views; a merge commit that takes the whole change from a
side branch, which is normally omitted from the output, is shown
in addition to the commits that introduce real changes.

* ds/revision-show-pulls:
  revision: --show-pulls adds helpful merges
revision.c diff1 | diff2 | blob | history
revision.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.