diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:52 -0700 |
| commit | eb3a4fc149d1a0d604ea6abf9085b3acfe3e85e6 (patch) | |
| tree | c2cea01d268485d0054dc11e00869e4cc4ce898a /git-pull.sh | |
| parent | Merge branch 'kb/am-deprecate-resolved' (diff) | |
| parent | lib-rebase: style: use write_script, <<-\EOF (diff) | |
| download | tgif-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 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions