| commit | cf8a8c6bd53c43e29cb735eb7934ffc996475d77 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Mar 2015 21:58:38 +0000 (31 14:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Mar 2015 21:58:38 +0000 (31 14:58 -0700) | ||
| tree | a50e887cc7bed478902004e88322f2542f3d16a5 | treesnapshot (tar.gz zip) |
| parent | a3b75b3ccbc0f8128937d3b393837c2a74f2b662 | commitdiff |
| parent | 52735a689270bb1de94eb3de198594b36caed9bb | commitdiff |
Sync with 2.3.5
* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
* maint:
Git 2.3.5
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
| Documentation/git-rebase.txt | diff1 | diff2 | blobhistory |
| Documentation/git.txt | diff1 | diff2 | blobhistory |