summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-11-18 16:04:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-18 16:04:17 -0800
commitd577bc58a3424f4d0d7f7c8094753b92cb7cb823 (patch)
tree35902569e856a884a6bb2c31a26de5fdbc5713a0 /Documentation/git-merge-index.txt
parentMerge branch 'sh/p4' (diff)
parentgit-checkout: Test for relative path use. (diff)
downloadtgif-d577bc58a3424f4d0d7f7c8094753b92cb7cb823.tar.xz
Merge branch 'ds/checkout-upper'
* ds/checkout-upper: git-checkout: Test for relative path use. git-checkout: Support relative paths containing "..".
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions