diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-30 21:58:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-30 21:58:01 (GMT) |
| commit | 1692579dd3569ebc01187872db91ee2ad93cc962 (patch) | |
| tree | a0f3f06c4a4d4fd9ee038de63ce69d165fc7ac22 /resolve-undo.c | |
| parent | 563b3527b41a978eeef77d9426be460013c35d88 (diff) | |
| parent | 90e1818f9a06015159712e204dd90868e0a6c421 (diff) | |
| download | git-1692579dd3569ebc01187872db91ee2ad93cc962.zip git-1692579dd3569ebc01187872db91ee2ad93cc962.tar.gz git-1692579dd3569ebc01187872db91ee2ad93cc962.tar.bz2 | |
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
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions