diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:37:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:37:07 -0700 |
| commit | 2f0db1d86bb89a30c6742b03c40b320c178b1097 (patch) | |
| tree | c79e8aca5aebc9b4384463492a4e7c0ff9050912 /builtin/unpack-file.c | |
| parent | c69e8b693591bc35e8f9421eacb9d59c71807304 (diff) | |
| parent | 0d8fc3efc65df74a2b39b3f9798861a1b2055b62 (diff) | |
| download | git-2f0db1d86bb89a30c6742b03c40b320c178b1097.tar.gz git-2f0db1d86bb89a30c6742b03c40b320c178b1097.tar.xz | |
Merge branch 'jc/maint-branch-mergeoptions' into maint
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Conflicts:
builtin/merge.c
Diffstat (limited to 'builtin/unpack-file.c')
0 files changed, 0 insertions, 0 deletions