Files
git/Documentation
Junio C Hamano 33f2790eca Merge branch 'vv/merge-squash-with-explicit-commit' into maint
"git merge --squash" is designed to update the working tree and the
index without creating the commit, and this cannot be countermanded
by adding the "--commit" option; the command now refuses to work
when both options are given.

* vv/merge-squash-with-explicit-commit:
  merge: refuse --commit with --squash
2019-07-25 14:27:10 -07:00
..
2019-06-03 11:25:12 -07:00
2019-05-09 00:37:27 +09:00
2019-03-18 15:54:17 +09:00
2018-06-25 13:22:36 -07:00
2019-01-23 11:37:29 -08:00
2019-04-25 16:41:18 +09:00
2019-01-23 11:37:29 -08:00
2019-01-23 11:37:29 -08:00
2019-03-20 15:16:06 +09:00
2019-01-23 11:37:29 -08:00
2019-04-25 16:41:14 +09:00
2018-09-17 13:53:55 -07:00
2019-01-23 11:37:29 -08:00
2019-01-23 11:37:29 -08:00
2019-01-23 11:37:29 -08:00
2019-03-18 14:45:21 +09:00
2018-12-26 14:59:37 -08:00
2019-04-22 11:14:45 +09:00
2019-05-09 00:37:27 +09:00