summaryrefslogtreecommitdiff
path: root/archive-zip.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:28:51 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-25 13:28:51 +0900
commit850e9257525ef2fa13e1d34ccce4e6b73085bb4e (patch)
tree9de3df7ba23ef1db1b95d1a51d98f00ce784711f /archive-zip.c
parentMerge branch 'pw/rebase-keep-empty-fixes' (diff)
parentrebase --keep-empty: always use interactive rebase (diff)
downloadtgif-850e9257525ef2fa13e1d34ccce4e6b73085bb4e.tar.xz
Merge branch 'pw/rebase-signoff'
"git rebase" has learned to honor "--signoff" option when using backends other than "am" (but not "--preserve-merges"). * pw/rebase-signoff: rebase --keep-empty: always use interactive rebase rebase -p: error out if --signoff is given rebase: extend --signoff support
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions