summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2016-02-25 09:37:30 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-25 09:33:58 -0800
commita217f07388b847192565c71e5ef6a9cc81633594 (patch)
tree59781b302ed1172868dc3f524963cbe2fa977181 /merge.c
parentREADME.md: don't call git stupid in the title (diff)
downloadtgif-a217f07388b847192565c71e5ef6a9cc81633594.tar.xz
README.md: move down historical explanation about the name
The explanations about why the name was chosen are secondary compared to the description and link to the documentation. Some consider these explanations as good computer scientists joke, but other see it as needlessly offensive vocabulary. This patch preserves the historical joke, but gives it less importance by moving it to the end of the README, and makes it clear that it is a historical explanation, that does not necessarily reflect the state of mind of current developers. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions