diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:39 -0700 |
| commit | 797d44343c831680aeae3392259fcadeb178bf61 (patch) | |
| tree | 6639bf5dfb12eea0a67bd3b3323e3cabd79bc58e /t/t4013-diff-various.sh | |
| parent | 954f7cfdac48b8d9fe91c29ecfa44ac0c639867c (diff) | |
| parent | 2bf6587349e31b582dae47954b1a334052230e28 (diff) | |
| download | git-797d44343c831680aeae3392259fcadeb178bf61.tar.gz | |
Merge branch 'pb/log-first-parent-p-m'
* pb/log-first-parent-p-m:
show --first-parent/-m: do not default to --cc
show -c: show patch text
revision: introduce setup_revision_opt
t4013: add tests for log -p -m --first-parent
git log -p -m: document -m and honor --first-parent
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 8e3694ed5b..dae6358516 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -204,6 +204,9 @@ log --root --patch-with-stat --summary master log --root -c --patch-with-stat --summary master # improved by Timo's patch log --root --cc --patch-with-stat --summary master +log -p --first-parent master +log -m -p --first-parent master +log -m -p master log -SF master log -SF -p master log --decorate --all @@ -235,6 +238,9 @@ show initial show --root initial show side show master +show -c master +show -m master +show --first-parent master show --stat side show --stat --summary side show --patch-with-stat side |