summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-03-25 00:38:53 +0000
committerJunio C Hamano <junio@kernel.org>2010-03-25 00:38:53 +0000
commit3166736468c0b21727d059d09468111c5a3163c4 (patch)
treef94473e9050b0b159edbdec0a0619f4d8d57c11d /git-log.txt
parent9ccf664de57a05c6417f1fe46f6c6b55322f218c (diff)
downloadgit-htmldocs-3166736468c0b21727d059d09468111c5a3163c4.tar.gz
Autogenerated HTML docs for v1.7.0.3-291-g5e4f
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/git-log.txt b/git-log.txt
index 0e39bb61e..fb184ba18 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -118,6 +118,15 @@ git log master --not --remotes=*/master::
Shows all commits that are in local master but not in any remote
repository master branches.
+git log -p -m --first-parent::
+
+ Shows the history including change diffs, but only from the
+ "main branch" perspective, skipping commits that come from merged
+ branches, and showing full diffs of changes introduced by the merges.
+ This makes sense only when following a strict policy of merging all
+ topic branches when staying on a single integration branch.
+
+
Discussion
----------