Commit Graph

11 Commits (fe6c49b9bd78f5d381006c6fef2ed1621d09e364)

Author SHA1 Message Date
Gonzalo Matheu 3d5d15621b
git-merge: update page (#10232)
* git-merge: Added merge with strategy options

Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com>

* git-merge: -e to --edit

---------

Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com>
Co-authored-by: K.B.Dharun Krishna <kbdharunkrishna@gmail.com>
2023-05-19 09:33:57 +05:30
Danny Kim 0e4edc1afc git-merge: reword git merge description (#3662) 2019-12-17 20:35:16 +00:00
Marco Bonelli 66abb98ce9 Refactor: reword English pages' links' descriptions. 2019-06-03 14:19:41 +02:00
Starbeamrainbowlabs a19866e88a
multiple pages: add homepages (#2660) 2019-01-30 11:19:23 +00:00
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