projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f72432d 28cb060)
Merge branch 'mw/doc-merge-enumfix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:45 +0000 (10:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:45 +0000 (10:18 -0700)
commit23fc55a90c0956908cb595789b460179c062153b
tree7c5787569ea6c158048f0e28195b5dc1c44784b6tree | snapshot
parentf72432d64ebc4fea80265114464ddb7b25ce9633commit | diff
parent28cb06020bc86eea46288c29673ac108c3944089commit | diff
Merge branch 'mw/doc-merge-enumfix'

Fix old merge glitch in Documentation during v2.13-rc0 era.

* mw/doc-merge-enumfix:
  doc: update the order of the syntax `git merge --continue`
Documentation/git-merge.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.