Neil Horman
90e1818f9a
git-rebase: add keep_empty flag
...
Add a command line switch to git-rebase to allow a user the ability to specify
that they want to keep any commits in a series that are empty.
When git-rebase's type is am, then this option will automatically keep any
commit that has a tree object identical to its parent.
This patch changes the default behavior of interactive rebases as well. With
this patch, git-rebase -i will produce a revision set passed to
git-revision-editor, in which empty commits are commented out. Empty commits
may be kept manually by uncommenting them. If the new --keep-empty option is
used in an interactive rebase the empty commits will automatically all be
uncommented in the editor.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-24 15:24:14 -07:00
..
2012-03-28 08:47:23 -07:00
2012-04-06 10:47:58 -07:00
2012-03-30 20:25:55 -07:00
2011-08-08 09:30:12 -07:00
2010-09-03 09:43:42 -07:00
2011-10-05 10:47:10 -07:00
2012-02-27 15:10:23 -08:00
2012-03-04 22:21:52 -08:00
2009-12-03 12:41:37 -08:00
2012-03-01 09:15:58 -08:00
2010-01-31 10:24:53 -08:00
2011-03-08 14:44:07 -08:00
2012-03-15 21:54:31 -07:00
2010-08-20 10:53:56 -07:00
2010-11-03 09:19:10 -07:00
2011-03-09 13:10:35 -08:00
2011-05-31 12:01:06 -07:00
2012-01-29 13:18:53 -08:00
2011-07-06 14:26:26 -07:00
2011-03-11 10:59:16 -05:00
2011-03-11 10:59:16 -05:00
2011-08-04 15:49:13 -07:00
2010-08-20 14:16:51 -07:00
2011-08-09 10:26:18 -07:00
2011-05-09 15:27:50 -07:00
2012-03-06 11:43:23 -08:00
2011-03-11 10:59:16 -05:00
2011-03-11 10:59:16 -05:00
2011-09-22 16:38:22 -07:00
2011-10-05 13:45:30 -07:00
2011-03-11 10:59:16 -05:00
2011-05-05 13:31:11 -07:00
2012-04-24 14:52:12 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-08-28 23:47:55 -07:00
2012-01-16 16:26:26 -08:00
2011-11-12 22:25:07 -08:00
2011-06-29 09:25:51 -07:00
2012-03-01 14:45:14 -08:00
2011-07-06 14:26:26 -07:00
2011-12-11 23:16:25 -08:00
2011-12-11 23:16:25 -08:00
2011-12-12 16:09:38 -08:00
2011-07-06 14:26:26 -07:00
2011-03-11 10:59:16 -05:00
2011-05-26 22:15:38 -07:00
2011-10-15 21:15:06 -07:00
2011-03-11 10:59:16 -05:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-05-26 22:15:39 -07:00
2011-03-11 10:59:16 -05:00
2012-03-15 13:53:39 -07:00
2011-08-01 15:00:14 -07:00
2011-08-28 21:18:47 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-21 12:54:55 -07:00
2012-02-23 11:20:15 -08:00
2011-09-08 13:56:19 -07:00
2011-08-29 15:27:07 -07:00
2011-07-06 14:26:26 -07:00
2012-03-05 11:32:19 -08:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2012-03-26 12:06:48 -07:00
2011-08-04 15:49:13 -07:00
2011-03-11 10:59:16 -05:00
2011-07-06 14:26:26 -07:00
2011-07-11 09:35:46 -07:00
2011-08-23 21:36:20 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-03-11 10:59:16 -05:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-10-16 11:09:35 -07:00
2011-08-30 12:35:51 -07:00
2011-07-06 14:26:26 -07:00
2011-03-11 10:59:16 -05:00
2011-05-18 14:37:46 -07:00
2011-03-11 10:59:16 -05:00
2012-01-12 23:34:26 -08:00
2011-07-06 14:26:26 -07:00
2011-05-16 16:38:46 -07:00
2011-08-04 15:49:13 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2012-01-23 14:34:55 -08:00
2011-09-11 21:52:18 -07:00
2011-10-26 16:12:25 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-12-12 11:52:31 -08:00
2011-03-11 10:59:16 -05:00
2011-08-25 13:16:46 -07:00
2012-02-26 17:39:04 -08:00
2011-04-13 11:59:11 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-12-09 13:37:01 -08:00
2012-02-22 18:17:39 -08:00
2011-03-11 10:59:16 -05:00
2012-01-06 12:44:01 -08:00
2012-04-24 15:24:14 -07:00
2011-09-06 11:42:12 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-08-04 15:49:13 -07:00
2011-09-01 15:52:02 -07:00
2011-09-01 15:52:02 -07:00
2012-02-27 15:33:33 -08:00
2012-02-28 14:55:39 -08:00
2011-03-11 10:59:16 -05:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2012-03-08 14:40:44 -08:00
2011-11-23 13:24:54 -08:00
2011-05-19 10:55:54 -07:00
2011-08-16 11:04:31 -07:00
2011-11-22 18:16:59 -08:00
2011-08-04 15:49:13 -07:00
2012-02-27 10:29:24 -08:00
2011-09-06 11:10:41 -07:00
2012-03-28 11:18:35 -07:00
2011-09-11 21:52:18 -07:00
2011-12-28 11:42:51 -08:00
2011-07-06 14:26:26 -07:00
2011-03-11 10:59:16 -05:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2012-01-13 09:50:45 -08:00
2011-08-04 15:49:13 -07:00
2011-03-11 10:59:16 -05:00
2011-06-26 12:50:46 -07:00
2011-09-11 21:51:10 -07:00
2011-12-12 16:48:54 -08:00
2012-03-28 08:47:23 -07:00
2011-10-16 08:12:26 +00:00
2012-02-27 15:58:36 -08:00
2012-02-08 19:59:41 -08:00
2011-08-04 15:49:13 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-10-26 16:08:14 -07:00
2011-08-16 11:41:28 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-08-17 17:35:38 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-09-11 21:52:18 -07:00
2011-08-04 15:49:13 -07:00
2011-07-06 14:26:26 -07:00
2012-04-06 10:47:58 -07:00
2012-02-17 07:37:08 -08:00
2011-03-11 10:59:16 -05:00
2012-02-03 23:19:42 -08:00
2011-12-12 16:09:38 -08:00
2011-07-06 14:26:26 -07:00
2011-07-06 14:26:26 -07:00
2011-01-10 09:09:02 -08:00
2011-03-11 10:59:16 -05:00
2011-07-06 14:26:26 -07:00
2012-03-28 08:47:23 -07:00
2011-09-16 09:20:23 -07:00
2011-08-23 21:35:47 -07:00
2010-07-05 13:39:02 -07:00
2012-02-03 23:19:42 -08:00
2011-07-06 14:26:26 -07:00
2011-10-21 10:18:37 -07:00
2012-03-23 11:22:04 -07:00
2011-07-06 14:26:26 -07:00
2011-08-01 14:44:24 -07:00
2010-01-10 13:01:28 +01:00
2011-11-08 13:37:10 -08:00
2010-09-09 16:17:59 -07:00
2012-01-18 15:17:27 -08:00
2009-12-05 10:03:49 -08:00
2009-10-22 12:59:50 -07:00
2011-05-06 15:12:30 -07:00
2012-03-20 15:39:10 -07:00
2010-10-26 21:54:04 -07:00
2011-12-16 13:00:15 -08:00
2011-05-18 12:40:15 -07:00
2010-01-10 13:01:28 +01:00
2012-02-28 13:17:14 -08:00
2012-03-02 09:33:29 -08:00
2011-11-22 18:16:59 -08:00
2011-09-11 20:53:00 -07:00
2010-01-10 13:01:28 +01:00
2010-07-20 16:59:17 -07:00
2012-02-28 14:55:39 -08:00