| commit | edacb101ef831cdc59d07015b1b5cd1aaddcc588 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 23:06:31 +0000 (19 16:06 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 19 Oct 2008 23:06:31 +0000 (19 16:06 -0700) | ||
| tree | e03312e706ad3a285c19772189c48528b7ef3c2a | treesnapshot (tar.gz zip) |
| parent | 4f2d651e5b3414eac5d22ff47366d22c8cc289f6 | commitdiff |
| parent | f8cca019b9ea9471719505ca6ccf020feb219d98 | commitdiff |
Merge branch 'ae/preservemerge'
* ae/preservemerge:
rebase: Support preserving merges in non-interactive mode
* ae/preservemerge:
rebase: Support preserving merges in non-interactive mode
| Documentation/git-rebase.txt | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |