summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-03 00:26:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-03 00:26:17 -0800
commitf39e4cfa2ec2bab4175cee3a9e806d8b65161c75 (patch)
tree080aa6dcd4d42ef5e4583b7ea84f33d97efd7c1f /Documentation/git-read-tree.txt
parentMerge branch 'jk/maint-cleanup-after-exec-failure' (diff)
parentadd -u: do not fail to resolve a path as deleted (diff)
downloadtgif-f39e4cfa2ec2bab4175cee3a9e806d8b65161c75.tar.xz
Merge branch 'jc/maint-add-u-remove-conflicted'
* jc/maint-add-u-remove-conflicted: add -u: do not fail to resolve a path as deleted
Diffstat (limited to 'Documentation/git-read-tree.txt')
0 files changed, 0 insertions, 0 deletions