Merge branch 'ae/preservemerge'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 23:06:31 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 23:06:31 +0000 (16:06 -0700)
commitedacb101ef831cdc59d07015b1b5cd1aaddcc588
treee03312e706ad3a285c19772189c48528b7ef3c2a
parent4f2d651e5b3414eac5d22ff47366d22c8cc289f6
parentf8cca019b9ea9471719505ca6ccf020feb219d98
Merge branch 'ae/preservemerge'

* ae/preservemerge:
  rebase: Support preserving merges in non-interactive mode
Documentation/git-rebase.txt
git-rebase.sh