Junio C Hamano
c5da24a73a
Merge branch 'ct/advise-push-default'
...
Break down the cases in which "git push" fails due to non-ff into
three categories, and give separate advise messages for each case.
By Christopher Tiwald (2) and Jeff King (1)
* ct/advise-push-default:
Fix httpd tests that broke when non-ff push advice changed
clean up struct ref's nonfastforward field
push: Provide situational hints for non-fast-forward errors
2012-04-20 15:50:37 -07:00
..
2012-02-13 11:42:18 -08:00
2012-02-03 23:19:42 -08:00
2011-11-15 15:39:33 -08:00
2011-08-04 15:34:32 -07:00
2012-02-20 00:15:11 -08:00
2012-03-26 21:32:43 -07:00
2011-09-19 11:07:21 -07:00
2012-03-07 09:07:38 -08:00
2011-10-17 21:37:14 -07:00
2011-10-05 13:45:30 -07:00
2011-08-17 10:39:47 -07:00
2012-04-16 12:42:22 -07:00
2011-08-28 23:47:55 -07:00
2012-02-21 15:14:37 -08:00
2012-01-06 12:44:07 -08:00
2012-04-16 12:43:07 -07:00
2012-03-28 15:19:17 -07:00
2011-09-23 14:28:17 -07:00
2012-03-23 13:52:05 -07:00
2012-03-01 20:59:31 -08:00
2012-02-20 00:14:55 -08:00
2012-02-20 00:14:55 -08:00
2012-03-13 20:44:29 -07:00
2011-12-13 09:26:52 -08:00
2012-03-07 09:07:39 -08:00
2011-11-07 22:12:19 -08:00
2012-03-01 20:59:31 -08:00
2011-05-09 11:58:19 -07:00
2012-01-16 14:34:33 -08:00
2011-12-20 16:02:08 -08:00
2012-04-15 22:50:39 -07:00
2011-10-10 15:56:17 -07:00
2011-10-05 12:36:26 -07:00
2011-07-25 10:50:11 -07:00
2012-01-16 16:06:57 -08:00
2011-04-15 10:13:52 -07:00
2011-04-11 10:35:25 -07:00
2012-04-02 13:11:49 -07:00
2011-05-15 15:23:33 -07:00
2011-11-10 09:10:51 -08:00
2011-12-28 11:32:36 -08:00
2011-12-13 21:12:34 -08:00
2011-12-22 11:27:26 -08:00
2012-02-26 17:46:00 -08:00
2011-09-22 09:35:07 -07:00
2012-03-07 10:24:33 -08:00
2012-03-07 10:24:33 -08:00
2012-04-20 15:50:37 -07:00
2011-05-25 15:04:25 -07:00
2012-02-21 15:14:41 -08:00
2011-11-07 22:12:19 -08:00
2012-02-27 15:33:33 -08:00
2011-11-13 12:21:06 -08:00
2011-05-08 12:55:34 -07:00
2011-12-06 15:13:39 -08:00
2012-02-28 10:47:30 -08:00
2011-08-16 11:04:31 -07:00
2012-03-20 15:53:30 -07:00
2012-02-13 13:06:53 -08:00
2011-05-31 12:19:11 -07:00
2011-12-13 09:39:46 -08:00
2011-11-13 12:21:06 -08:00
2011-12-12 16:48:54 -08:00
2012-02-27 15:58:36 -08:00
2012-02-20 00:15:28 -08:00
2011-06-10 11:52:15 -07:00
2011-06-20 14:27:36 -07:00
2011-08-25 14:42:11 -07:00
2012-03-07 09:07:39 -08:00
2011-11-21 14:32:40 -08:00
2011-06-05 22:45:38 -07:00
2012-03-08 14:03:07 -08:00