summaryrefslogtreecommitdiff
path: root/block-sha1
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-01 12:41:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-01 12:41:52 -0700
commiteb3a4fc149d1a0d604ea6abf9085b3acfe3e85e6 (patch)
treec2cea01d268485d0054dc11e00869e4cc4ce898a /block-sha1
parentMerge branch 'kb/am-deprecate-resolved' (diff)
parentlib-rebase: style: use write_script, <<-\EOF (diff)
downloadtgif-eb3a4fc149d1a0d604ea6abf9085b3acfe3e85e6.tar.xz
Merge branch 'ap/rebase-multiple-fixups'
Having multiple "fixup!" on a line in the rebase instruction sheet did not work very well with "git rebase -i --autosquash". * ap/rebase-multiple-fixups: lib-rebase: style: use write_script, <<-\EOF rebase -i: handle fixup! fixup! in --autosquash
Diffstat (limited to 'block-sha1')
0 files changed, 0 insertions, 0 deletions