summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:53:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:53:59 -0700
commit98509d0f48ab2316699e0670da6b3e13616ed567 (patch)
tree6ba53b2d288def4eaf91ee9a47b54cafd70092cb /builtin/merge-index.c
parentMerge branch 'jk/patch-corrupted-delta-fix' (diff)
parentRevert "doc/Makefile: drop doc-diff worktree and temporary files on "make cle... (diff)
downloadtgif-98509d0f48ab2316699e0670da6b3e13616ed567.tar.xz
Merge branch 'jk/diff-rendered-docs'
Dev doc update. * jk/diff-rendered-docs: Revert "doc/Makefile: drop doc-diff worktree and temporary files on "make clean"" doc/Makefile: drop doc-diff worktree and temporary files on "make clean" doc-diff: add --clean mode to remove temporary working gunk doc-diff: fix non-portable 'man' invocation doc-diff: always use oids inside worktree SubmittingPatches: mention doc-diff
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions