diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:17:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 12:17:53 -0700 |
| commit | 5cf2c571d08f38b90887d41d5c03376714f0b00d (patch) | |
| tree | b4bd9d0b1363e854346168319d2445df32c3d5d5 /builtin.h | |
| parent | a634a6d209fc67ed8fb58925a6ae713b2a913a83 (diff) | |
| parent | 8fee8726470bd63db6c396ea6208ea487eaa8fab (diff) | |
| download | git-5cf2c571d08f38b90887d41d5c03376714f0b00d.tar.gz | |
Merge branch 'jk/complete-merge-pull'
The completion code did not know about quite a few options that are
common between "git merge" and "git pull", and a couple of options
unique to "git merge".
* jk/complete-merge-pull:
completion: add missing options for git-merge
completion: add a note that merge options are shared
Diffstat (limited to 'builtin.h')
0 files changed, 0 insertions, 0 deletions