diff options
author | 2010-01-26 10:08:44 -0600 | |
---|---|---|
committer | 2010-01-26 10:08:44 -0600 | |
commit | 225f78c817755bebff91629cc525a258cf60eaea (patch) | |
tree | fc8146efeb2e2165d5427854f7f36d78fa59e168 /Documentation/git-log.txt | |
parent | Makefile: drop dependency on $(wildcard */*.h) (diff) | |
parent | am: fix patch format detection for Thunderbird "Save As" emails (diff) | |
download | tgif-225f78c817755bebff91629cc525a258cf60eaea.tar.xz |
Merge branch 'master' of git://repo.or.cz/alt-git into jn/autodep
* 'master' of git://repo.or.cz/alt-git: (384 commits)
am: fix patch format detection for Thunderbird "Save As" emails
t0022: replace non-portable literal CR
tests: consolidate CR removal/addition functions
commit-tree: remove unused #define
t5541-http-push: make grep expression check for one line only
rebase: replace antiquated sed invocation
Add test-run-command to .gitignore
git_connect: use use_shell instead of explicit "sh", "-c"
gitweb.js: Workaround for IE8 bug
Make test numbers unique
Windows: Remove dependency on pthreadGC2.dll
Documentation: move away misplaced 'push --upstream' description
Documentation: add missing :: in config.txt
pull: re-fix command line generation
Documentation: merge: use MERGE_HEAD to refer to the remote branch
Documentation: simplify How Merge Works
Documentation: merge: add a section about fast-forward
Documentation: emphasize when git merge terminates early
Documentation: merge: add an overview
Documentation: merge: move merge strategy list to end
...
Conflicts:
Makefile
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r-- | Documentation/git-log.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 3d79de11ec..0e39bb61ee 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -14,9 +14,9 @@ DESCRIPTION ----------- Shows the commit logs. -The command takes options applicable to the 'git-rev-list' +The command takes options applicable to the 'git rev-list' command to control what is shown and how, and options applicable to -the 'git-diff-*' commands to control how the changes +the 'git diff-*' commands to control how the changes each commit introduces are shown. @@ -107,6 +107,17 @@ git log --follow builtin-rev-list.c:: those commits that occurred before the file was given its present name. +git log --branches --not --remotes=origin:: + + Shows all commits that are in any of local branches but not in + any of remote tracking branches for 'origin' (what you have that + origin doesn't). + +git log master --not --remotes=*/master:: + + Shows all commits that are in local master but not in any remote + repository master branches. + Discussion ---------- |