3 Коммитов

Автор	SHA1	Сообщение	Дата
Matthieu Moy	13931236b9	Change incorrect "remote branch" to "remote tracking branch" in C code ... (Just like we did for documentation already) In the process, we change "non-remote branch" to "branch outside the refs/remotes/ hierarchy" to avoid the ugly "non-remote-tracking branch". The new formulation actually corresponds to how the code detects this case (i.e. prefixcmp(refname, "refs/remotes")). Also, we use 'remote-tracking branch' in generated merge messages (by merge an fmt-merge-msg). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-11-03 09:20:47 -07:00
Junio C Hamano	105e473397	Fix log -g this@{upstream} ... It showed the correct objects but walked a wrong reflog. Again, tests are from Jeff King. Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-01-26 13:49:50 -08:00
Johannes Sixt	eca9388f39	Make test numbers unique ... Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-01-24 14:53:24 -08:00