diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-18 23:24:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-19 11:25:51 -0700 |
| commit | 4a3fedd5976ae9175cc418876d17ca568278b426 (patch) | |
| tree | 4ff71c24bb7056c11a0b9e43221c3c4aa4a4d06c /git-merge-one-file.sh | |
| parent | Documentation/git-merge.txt: Partial rewrite of How Merge Works (diff) | |
| download | tgif-4a3fedd5976ae9175cc418876d17ca568278b426.tar.xz | |
.mailmap update
A few people sent in patches under slightly different spelling recently.
Hopefully this catches most of them if not all (with help from Dscho).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions