summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-10 12:36:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-10 12:36:26 -0800
commit8ac7a77be668180d515e234d550cc661aa0c1ebd (patch)
tree8aa4710a131dbfd0722de487bcf91914882e39cd /Documentation/diff-format.txt
parentMerge branch 'jk/maint-format-patch-p-suppress-stat' (diff)
parentmerge: do not setup worktree twice (diff)
downloadtgif-8ac7a77be668180d515e234d550cc661aa0c1ebd.tar.xz
Merge branch 'maint'
* maint: merge: do not setup worktree twice check-ref-format: update usage string Conflicts: builtin-check-ref-format.c
Diffstat (limited to 'Documentation/diff-format.txt')
0 files changed, 0 insertions, 0 deletions