diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:32:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 12:32:59 -0800 |
| commit | 3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1 (patch) | |
| tree | 42fc1b67e7237c5c3913004c53bc8c14dea479c8 /remote.c | |
| parent | 740b6ad75bbe0cd0c3f4be30f0380814878ac445 (diff) | |
| parent | 134748353b2a71a34f899c9b1326ccf7ae082412 (diff) | |
| download | git-3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1.tar.gz git-3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1.tar.xz | |
Merge branch 'bg/merge-ff-only'
* bg/merge-ff-only:
Teach 'git merge' and 'git pull' the option --ff-only
Diffstat (limited to 'remote.c')
0 files changed, 0 insertions, 0 deletions