2 Commits

Author	SHA1	Message	Date
Johannes Schindelin	427c3bd28a	rebase: deprecate --preserve-merges ... We have something much better now: --rebase-merges (which is a complete re-design --preserve-merges, with a lot of issues fixed such as the inability to reorder commits with --preserve-merges). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2019-03-12 16:29:00 +09:00
Nguyễn Thái Ngọc Duy	7f50a495f6	config.txt: move pull-config.txt to config/ ... Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2018-10-29 10:17:03 +09:00