diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:14 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:07 +0900 |
| commit | e3de888ca052f7962c1a2e2f83b4640c40847ab2 (patch) | |
| tree | 12a57f9a7e02ffb50530980a510a785d1fbd73f0 /Documentation/git-describe.txt | |
| parent | merge-recursive: rename merge_options argument from 'o' to 'opt' (diff) | |
| download | tgif-e3de888ca052f7962c1a2e2f83b4640c40847ab2.tar.xz | |
merge-recursive: rename diff_filespec 'one' to 'o'
In the previous commit, we noted that several places throughout merge
recursive both had a reason to use 'o'; some for a merge_options struct,
and others for a diff_filespec struct. Some places had both, forcing
one of the two to be renamed, though the choice was inconsistent. Now
that the merge_options struct has been renamed to 'opt' everywhere, we
can replace the few places that used 'one' for the diff_filespec to 'o'.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-describe.txt')
0 files changed, 0 insertions, 0 deletions