diff options
| author |   Kent Fredric <kentfredric@gmail.com> | 2010-09-29 13:36:20 +1300 |
|---|---|---|
| committer | Kent Fredric <kentfredric@gmail.com> | 2010-09-29 13:36:20 +1300 |
| commit | 1338f4f509f3311734edc974515d16a737977684 (patch) | |
| tree | 34550fb5c53098edcaebc435afc0608e9da9d231 /README/index.txt | |
| parent | [doc] reorganise doc to be more logical (diff) | |
| download | perl-overlay-1338f4f509f3311734edc974515d16a737977684.tar.gz perl-overlay-1338f4f509f3311734edc974515d16a737977684.tar.bz2 perl-overlay-1338f4f509f3311734edc974515d16a737977684.zip | |
[doc] + merge option --ff-only
Diffstat (limited to 'README/index.txt')
| -rw-r--r-- | README/index.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/README/index.txt b/README/index.txt index 2c9d9fa5c..ed4518e4b 100644 --- a/README/index.txt +++ b/README/index.txt @@ -13,3 +13,4 @@ include::src/git/repositories.txt[] include::src/git/contribution-order.txt[] include::src/git/linearize-commits.txt[] include::src/git/work-in-a-branch.txt[] +include::src/git/disable-merge-pull.txt[] |