diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:23 -0700 |
| commit | 3d55eea805c5451afd0a56a4f5aa045ba63083f9 (patch) | |
| tree | 4f38cb28b86d9aa347dd4358ec3f511fb7dc52c3 /git-p4.py | |
| parent | 2b6456b8089e42232d80672525edbe411ba41549 (diff) | |
| parent | 715a51bcaf4f8625e99a972326bfce3fdace3071 (diff) | |
| download | git-3d55eea805c5451afd0a56a4f5aa045ba63083f9.tar.gz git-3d55eea805c5451afd0a56a4f5aa045ba63083f9.tar.xz | |
Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'
One part of "git am" had an oddball helper function that called
stuff from outside "his" as opposed to calling what we have "ours",
which was not gender-neutral and also inconsistent with the rest of
the system where outside stuff is usuall called "theirs" in
contrast to "ours".
* js/am-call-theirs-theirs-in-fallback-3way:
am: counteract gender bias
Diffstat (limited to 'git-p4.py')
0 files changed, 0 insertions, 0 deletions