tree a50e887cc7bed478902004e88322f2542f3d16a5
parent a3b75b3ccbc0f8128937d3b393837c2a74f2b662
parent 52735a689270bb1de94eb3de198594b36caed9bb
author Junio C Hamano <gitster@pobox.com> 1427839118 -0700
committer Junio C Hamano <gitster@pobox.com> 1427839118 -0700

Sync with 2.3.5

* maint:
  Git 2.3.5
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does