]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b6456b 715a51b)
Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:23 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Jul 2016 20:22:23 +0000 (13:22 -0700)
commit3d55eea805c5451afd0a56a4f5aa045ba63083f9
tree4f38cb28b86d9aa347dd4358ec3f511fb7dc52c3tree | snapshot
parent2b6456b8089e42232d80672525edbe411ba41549commit | diff
parent715a51bcaf4f8625e99a972326bfce3fdace3071commit | diff
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
builtin/am.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.