]> git.ipfire.org Git - thirdparty/git.git/commit - rerere.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 925d73c) | patch
rerere: call conflict-ids IDs
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2015 21:45:55 +0000 (14:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 23:04:41 +0000 (16:04 -0700)
commit18bb99342fdb4b612ae45be3fef084ceebd498a0
tree35f24636a250b4d1990fe95084b82015a338a5e5tree | snapshot
parent925d73c4217388838e36bfed85553132c458c7d0commit | diff
rerere: call conflict-ids IDs

Most places we call conflict IDs "name" and some others we call them
"hex"; update all of them to "id".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rerere.c diff | blob | blame | history
rerere.c diff | blob | blame | history
rerere.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.