diff options
| author |  Pete Wyckoff <pw@padd.com> | 2014-01-21 18:16:48 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-01-22 08:06:20 -0800 |
| commit | f84cb684634f50df7adde7f52c25f049d257f0e3 (patch) | |
| tree | cc0169dbbf691963cfdcf9d333ac434793228aab /builtin/merge.c | |
| parent | git p4 test: examine behavior with locked (+l) files (diff) | |
| download | tgif-f84cb684634f50df7adde7f52c25f049d257f0e3.tar.xz | |
git p4 doc: use two-line style for options with multiple spellings
Thomas Rast noticed the docs have a mix of styles when
it comes to options with multiple spellings. Standardize
the couple in git-p4.txt that are odd.
Instead of:
-n, --dry-run::
Do this:
-n::
--dry-run::
See
http://thread.gmane.org/gmane.comp.version-control.git/219936/focus=219945
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions