summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-02-05 14:26:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-05 14:26:17 -0800
commit69dd6e57374f4aa5dcda0736529be47b16a08afe (patch)
tree580c5fd6f1360d82a911ac18108a2afd1b9d649a /builtin/am.c
parentMerge branch 'jk/diff-cc-stat-fixes' (diff)
parentimplicit interactive rebase: don't run sequence editor (diff)
downloadtgif-69dd6e57374f4aa5dcda0736529be47b16a08afe.tar.xz
Merge branch 'pw/no-editor-in-rebase-i-implicit'
When GIT_SEQUENCE_EDITOR is set, the command was incorrectly started when modes of "git rebase" that implicitly uses the machinery for the interactive rebase are run, which has been corrected. * pw/no-editor-in-rebase-i-implicit: implicit interactive rebase: don't run sequence editor
Diffstat (limited to 'builtin/am.c')
0 files changed, 0 insertions, 0 deletions