diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-31 21:54:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-31 21:54:12 (GMT) |
| commit | ad00aebfe93b3fc79c5ed54569f1603b8030783a (patch) | |
| tree | e41f9df2842aa74a3c692d733e1a09d708c2c413 /Documentation/githooks.txt | |
| parent | ab0fb57aac6c5b6f074c07c7e2729bcff58cc45d (diff) | |
| parent | d50d31e8808261eccfa6bde826e5e63368e29573 (diff) | |
| download | git-ad00aebfe93b3fc79c5ed54569f1603b8030783a.zip git-ad00aebfe93b3fc79c5ed54569f1603b8030783a.tar.gz git-ad00aebfe93b3fc79c5ed54569f1603b8030783a.tar.bz2 | |
Merge branch 'ss/pull-rebase-preserve' into maint
* ss/pull-rebase-preserve:
docs: clarify what git-rebase's "-p" / "--preserve-merges" does
docs: clarify "preserve" option wording for git-pull
Diffstat (limited to 'Documentation/githooks.txt')
0 files changed, 0 insertions, 0 deletions