Junio C Hamano ab5fb34db3
Merge branch 'js/branch-track-inherit' into next ...
"git -c branch.autosetupmerge=inherit branch new old" makes "new"
to have the same upstream as the "old" branch, instead of marking
"old" itself as its upstream.
* js/branch-track-inherit:
config: require lowercase for branch.*.autosetupmerge
branch: add flags and config to inherit tracking
branch: accept multiple upstream branches for tracking
2022-01-03 16:25:37 -08:00
2019-11-14 11:10:04 +09:00
2021-08-30 16:35:36 -07:00
2019-06-06 09:33:42 -07:00
2021-06-28 10:05:13 -07:00
2022-01-03 16:25:37 -08:00
2021-04-19 11:57:05 -07:00
2021-04-01 12:58:58 -07:00
2021-11-01 13:48:08 -07:00
2021-02-25 15:10:41 -08:00
2021-01-15 15:20:28 -08:00
2020-11-25 12:30:18 -08:00
2021-07-15 16:54:34 -07:00
2020-07-30 09:16:49 -07:00
2020-09-25 11:40:42 -07:00
2021-06-30 14:57:22 -07:00
2020-09-27 14:22:41 -07:00
2020-11-21 15:14:38 -08:00
2019-03-07 09:25:32 +09:00
2020-11-21 11:39:55 -08:00
2021-12-27 15:31:36 -08:00
2021-12-05 12:26:43 -08:00
2021-08-27 12:45:45 -07:00
2021-08-14 11:20:49 -07:00
2021-01-04 11:27:48 -08:00
2021-03-30 12:57:47 -07:00
2021-02-05 13:49:55 -08:00
2019-05-07 13:04:47 +09:00
2021-04-16 23:38:35 -07:00
2021-02-05 13:49:53 -08:00
2021-02-09 23:09:29 -08:00
2021-12-01 14:45:59 -08:00
2021-03-13 15:30:29 -08:00
2021-09-14 16:34:18 -07:00
2020-09-25 11:40:42 -07:00
2021-09-07 21:45:32 -07:00
2021-07-13 16:52:49 -07:00
2021-03-23 14:05:58 -07:00
2020-08-27 12:47:47 -07:00
2019-06-25 14:05:38 -07:00
2019-03-18 14:09:54 +09:00
2021-05-28 18:38:07 +09:00
2021-05-22 17:56:46 +09:00
2019-06-21 09:35:00 -07:00
2021-07-20 14:57:43 -07:00
2020-03-18 12:42:09 -07:00
2020-03-18 12:42:09 -07:00
2021-01-04 11:27:48 -08:00
2021-09-01 07:54:30 -07:00
2021-04-19 14:09:11 -07:00
2021-11-19 09:05:25 -08:00
ab5fb34db3