7 commits

Author	SHA1	Message	Date
Borek Bernard	9225a7b2d5	git-merge: --abort mentions that it's for situations with conflicts	2018-07-19 13:45:22 +05:30
Borek Bernard	bade4c7c03	git-merge: add --abort	2018-07-19 13:45:22 +05:30
Dillon Flamand	4bd7a1da17	git-merge: add --no-ff example ... Include an example and brief description of the --no-ff option	2018-04-04 18:55:22 +05:30
Te-Chi Liu	5a54763c72	fixup: token string style (#1081) ... - use underscore rather than minus - use lower case rather than uppder case	2016-09-21 21:05:46 +05:30
Ruben Vereecken	066582e8ea	Formatted all pages according to guidelines.	2016-01-08 09:38:59 +01:00
lord63	56a7cba656	Fix lint for common	2015-10-23 08:02:34 +08:00
kxy	4d70294f06	split git commands	2014-03-09 13:20:13 +01:00