diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-30 14:59:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-30 14:59:53 -0700 |
| commit | 1e633418479926bc85ed21a4f91c845a3dd3ad66 (patch) | |
| tree | abcd420c9b200b22e4c62065b2b4db089c091a50 /Documentation | |
| parent | 9855b08d35edf8a8a441f24ff7b00e220a29f261 (diff) | |
| parent | 8695353147e0c20fc8197fd73efec2ca9bce0304 (diff) | |
| download | git-1e633418479926bc85ed21a4f91c845a3dd3ad66.tar.gz | |
Merge branch 'maint'
* maint:
Fix typo in pack-objects' usage
Make sure that git_getpass() never returns NULL
t0004 (unwritable files): simplify error handling
rev-list-options: clarify --parents and --children
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/rev-list-options.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index e2237ae4a0..ebc0108731 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -45,13 +45,13 @@ endif::git-rev-list[] --parents:: - Print the parents of the commit. Also enables parent - rewriting, see 'History Simplification' below. + Print also the parents of the commit (in the form "commit parent..."). + Also enables parent rewriting, see 'History Simplification' below. --children:: - Print the children of the commit. Also enables parent - rewriting, see 'History Simplification' below. + Print also the children of the commit (in the form "commit child..."). + Also enables parent rewriting, see 'History Simplification' below. ifdef::git-rev-list[] --timestamp:: |