]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb7460f 572fc9a)
Merge branch 'so/separate-field-for-m-and-diff-merges'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Sep 2020 20:53:07 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Sep 2020 20:53:07 +0000 (13:53 -0700)
commitc1ce30d364e2161c558466cf938ca71fb456f6c3
tree3c90f4d0dcbe0975240c072b02a7a0be63ec6d9dtree | snapshot
parenteb7460fd312511941d64007b5dfc4799a20a8d18commit | diff
parent572fc9aa5471ce7a9888f03a32d556350f88a5cfcommit | diff
Merge branch 'so/separate-field-for-m-and-diff-merges'

Internal API clean-up to handle two options "diff-index" and "log"
have, which happen to share the same short form, more sensibly.

* so/separate-field-for-m-and-diff-merges:
  revision: add separate field for "-m" of "diff-index -m"
revision.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.