| commit | 91d2dfdea7b1bf6a698d5a3d894f9ac6cd7fe753 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Apr 2012 22:24:35 +0000 (24 15:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Apr 2012 22:24:35 +0000 (24 15:24 -0700) | ||
| tree | 8e297adadaf79f2f46cd0d9242459de881155df8 | treesnapshot (tar.gz zip) |
| parent | bf55d92c25af110e1cf6c03ff0c5bde32743453c | commitdiff |
| parent | 90e1818f9a06015159712e204dd90868e0a6c421 | commitdiff |
Merge branch 'nh/empty-rebase' into next
"git rebase" learned to optionally keep commits that do not introduce
any change in the original history.
By Neil Horman
* nh/empty-rebase:
git-rebase: add keep_empty flag
git-cherry-pick: Add test to validate new options
git-cherry-pick: Add keep-redundant-commits option
git-cherry-pick: add allow-empty option
"git rebase" learned to optionally keep commits that do not introduce
any change in the original history.
By Neil Horman
* nh/empty-rebase:
git-rebase: add keep_empty flag
git-cherry-pick: Add test to validate new options
git-cherry-pick: Add keep-redundant-commits option
git-cherry-pick: add allow-empty option
| builtin/revert.c | diff1 | diff2 | blobhistory |
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| sequencer.c | diff1 | diff2 | blobhistory |