projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 563b352 90e1818)
Merge branch 'nh/empty-rebase'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 21:58:00 +0000 (14:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 21:58:01 +0000 (14:58 -0700)
commit1692579dd3569ebc01187872db91ee2ad93cc962
treea0f3f06c4a4d4fd9ee038de63ce69d165fc7ac22tree | snapshot
parent563b3527b41a978eeef77d9426be460013c35d88commit | diff
parent90e1818f9a06015159712e204dd90868e0a6c421commit | diff
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
builtin/revert.c diff1 | diff2 | blob | history
git-rebase--interactive.sh diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
Git—the stupid content tracker