Files
git/builtin
Junio C Hamano 299deeac8a Merge branch 'ah/pull'
Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.

* ah/pull:
  pull: don't warn if pull.ff has been set
2020-09-29 14:01:22 -07:00
..
2020-09-25 15:25:38 -07:00
2020-07-30 19:18:06 -07:00
2020-09-03 12:37:02 -07:00
2020-08-11 18:04:11 -07:00
2020-09-25 15:25:38 -07:00
2020-07-30 19:18:06 -07:00
2020-07-30 19:18:06 -07:00
2020-09-25 15:25:38 -07:00
2020-03-24 15:04:43 -07:00
2020-08-24 14:54:30 -07:00
2020-09-25 15:25:38 -07:00
2019-05-13 14:22:54 +09:00
2020-04-28 10:47:10 -07:00
2020-03-24 15:04:44 -07:00
2020-05-13 12:19:18 -07:00
2020-09-29 14:01:22 -07:00
2020-09-06 13:15:46 -07:00
2020-09-25 15:25:38 -07:00
2020-07-30 19:18:06 -07:00
2020-09-02 14:39:25 -07:00
2020-09-02 14:39:25 -07:00
2020-04-28 10:47:10 -07:00
2020-04-28 10:47:10 -07:00
2020-07-30 19:18:06 -07:00
2020-08-11 18:04:11 -07:00
2019-06-19 08:19:21 -07:00
2020-09-18 17:58:04 -07:00