| commit | 1692579dd3569ebc01187872db91ee2ad93cc962 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Apr 2012 21:58:00 +0000 (30 14:58 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Apr 2012 21:58:01 +0000 (30 14:58 -0700) | ||
| tree | a0f3f06c4a4d4fd9ee038de63ce69d165fc7ac22 | treesnapshot (tar.gz zip) |
| parent | 563b3527b41a978eeef77d9426be460013c35d88 | commitdiff |
| parent | 90e1818f9a06015159712e204dd90868e0a6c421 | commitdiff |
Merge branch 'nh/empty-rebase'
"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 |