summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-01 12:45:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-01 12:45:19 -0700
commit6dec263333417738528089834bd8cda72017aa31 (patch)
tree70e67708b1100262c98206130af057cc0b137fa6 /builtin/merge.c
parentMerge branch 'mm/log-format-raw-doc' (diff)
parenthelp: respect new common command grouping (diff)
downloadtgif-6dec263333417738528089834bd8cda72017aa31.tar.xz
Merge branch 'sg/help-group'
Group list of commands shown by "git help" along the workflow elements to help early learners. * sg/help-group: help: respect new common command grouping command-list.txt: drop the "common" tag generate-cmdlist: parse common group commands command-list.txt: add the common groups block command-list: prepare machinery for upcoming "common groups" section
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions