diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-04 15:51:35 -0700 |
| commit | 3340f60483e4ccb74db5d0eb453396322c2962aa (patch) | |
| tree | 923ee9affb633b4e1ac45b129e763d91899e9b53 /Documentation/merge-options.txt | |
| parent | 0cb09a7e0c91725c9ac926f1b6767dce597d19dd (diff) | |
| parent | bea7d16e8b8248602ea033b188f862699af4b977 (diff) | |
| download | git-3340f60483e4ccb74db5d0eb453396322c2962aa.tar.gz | |
Merge branch 'ss/cherry-pick-x-doc'
* ss/cherry-pick-x-doc:
doc: Clarify that "cherry-pick -x" does not use "git notes"
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions