commit | cf8a8c6bd53c43e29cb735eb7934ffc996475d77 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Tue Mar 31 14:58:38 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Mar 31 14:58:38 2015 -0700 |
tree | a50e887cc7bed478902004e88322f2542f3d16a5 | |
parent | a3b75b3ccbc0f8128937d3b393837c2a74f2b662 [diff] | |
parent | 52735a689270bb1de94eb3de198594b36caed9bb [diff] |
Sync with 2.3.5 * maint: Git 2.3.5 docs: clarify what git-rebase's "-p" / "--preserve-merges" does