summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.6.5.3.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-19 13:22:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-19 13:22:23 -0700
commit3d55eea805c5451afd0a56a4f5aa045ba63083f9 (patch)
tree4f38cb28b86d9aa347dd4358ec3f511fb7dc52c3 /Documentation/RelNotes/1.6.5.3.txt
parentMerge branch 'jk/write-file' (diff)
parentam: counteract gender bias (diff)
downloadtgif-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 'Documentation/RelNotes/1.6.5.3.txt')
0 files changed, 0 insertions, 0 deletions