| commit | 174f9e622fde6c874ba3d53eb05d0f37d6001ba5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Jul 2016 18:25:59 +0000 (28 11:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 28 Jul 2016 18:25:59 +0000 (28 11:25 -0700) | ||
| tree | a35f4a0f84705f95b9679b7efa326740a79d74a6 | treesnapshot (tar.gz zip) |
| parent | 8a81d5f5f81c8e42927b4361bc93ddfc345393b7 | commitdiff |
| parent | 715a51bcaf4f8625e99a972326bfce3fdace3071 | commitdiff |
Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
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
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
| builtin/am.c | diff1 | diff2 | blobhistory |