diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-05 14:03:47 -0800 |
| commit | 01a5774571d9dcc545d81d5f6d9781df9591c4cf (patch) | |
| tree | d8b3b9dbb429194ac38e90c76424d4cbbbe60460 /Documentation/git-merge.txt | |
| parent | Merge branch 'ow/stash-with-ifs' into maint (diff) | |
| parent | Documentation: "git pull" does not have the "-m" option (diff) | |
| download | tgif-01a5774571d9dcc545d81d5f6d9781df9591c4cf.tar.xz | |
Merge branch 'jc/maint-pull-docfix' into maint
The documentation to "git pull" hinted there is an "-m" option
because it incorrectly shared the documentation with "git merge".
* jc/maint-pull-docfix:
Documentation: "git pull" does not have the "-m" option
Documentation: exclude irrelevant options from "git pull"
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions