summaryrefslogtreecommitdiff
path: root/Documentation/git-add.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:45:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-12 21:45:14 -0700
commitd9b04430d238be1fe75ef97e3455c65ca72a7fa0 (patch)
treee9e0d7d1e46d47575302935f5a64bd1444c14152 /Documentation/git-add.txt
parentMerge branch 'js/maint-1.6.1-rebase-i-submodule' into maint-1.6.1 (diff)
parentadd -u: do not fail to resolve a path as deleted (diff)
downloadtgif-d9b04430d238be1fe75ef97e3455c65ca72a7fa0.tar.xz
Merge branch 'jc/maint-1.6.1-add-u-remove-conflicted' into maint-1.6.1
* jc/maint-1.6.1-add-u-remove-conflicted: add -u: do not fail to resolve a path as deleted
Diffstat (limited to 'Documentation/git-add.txt')
0 files changed, 0 insertions, 0 deletions