diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:41:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:41:51 -0800 |
| commit | 5cdc9fbb0894023da8e4dab552dfdda8b662feab (patch) | |
| tree | 9c4c577d565a76e2af67903d4cf0e98a3d416c14 /builtin/archive.c | |
| parent | b6b3b6a01f357922ccd14f2615accc9bd39fc194 (diff) | |
| parent | 3adab6f3a7793253b22a4a7aae34221d19e0236a (diff) | |
| download | git-5cdc9fbb0894023da8e4dab552dfdda8b662feab.tar.gz git-5cdc9fbb0894023da8e4dab552dfdda8b662feab.tar.xz | |
Merge branch 'jn/merge-no-edit-fix'
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
Diffstat (limited to 'builtin/archive.c')
0 files changed, 0 insertions, 0 deletions