summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-19 16:06:31 -0700
committerJunio C Hamano <gitster@pobox.com>2008-10-19 16:06:31 -0700
commitedacb101ef831cdc59d07015b1b5cd1aaddcc588 (patch)
treee03312e706ad3a285c19772189c48528b7ef3c2a /gitweb
parent4f2d651e5b3414eac5d22ff47366d22c8cc289f6 (diff)
parentf8cca019b9ea9471719505ca6ccf020feb219d98 (diff)
downloadgit-edacb101ef831cdc59d07015b1b5cd1aaddcc588.tar.gz
Merge branch 'ae/preservemerge'
* ae/preservemerge: rebase: Support preserving merges in non-interactive mode
Diffstat (limited to 'gitweb')
0 files changed, 0 insertions, 0 deletions