diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:30:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-31 22:30:42 -0800 |
| commit | af6b37fab1a97943c804f4983452c7fde5b0fbbe (patch) | |
| tree | 8ca886b1a5d0d7032bb5393c14ac82fae2dfcfc3 /builtin/merge-base.c | |
| parent | 2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa (diff) | |
| parent | f8246281af9adb0fdddbcc90d2e19cb5cd5217e5 (diff) | |
| download | git-af6b37fab1a97943c804f4983452c7fde5b0fbbe.tar.gz git-af6b37fab1a97943c804f4983452c7fde5b0fbbe.tar.xz | |
Merge branch 'jc/pull-signed-tag'
* jc/pull-signed-tag:
merge: use editor by default in interactive sessions
Conflicts:
Documentation/merge-options.txt
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions