diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-13 23:24:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 23:24:02 -0800 |
| commit | 42e283a1bfd0651fd2e6264157ecbe8841511788 (patch) | |
| tree | d5b1e1235c93e4cad18dd37894e8cb7bd2be4adf /Makefile | |
| parent | 58d4203aa617293d1dc3746a1ea33d84eb766e0f (diff) | |
| parent | 3adab6f3a7793253b22a4a7aae34221d19e0236a (diff) | |
| download | git-42e283a1bfd0651fd2e6264157ecbe8841511788.tar.gz | |
Merge branch 'jn/merge-no-edit-fix' into maint
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions