summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-07-24 06:30:49 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-04 11:21:44 -0700
commit3f8099fce7779631fe8827a8979d7b57629a36de (patch)
tree6d3c022d4484555b2f0758b931505b95a2a87b11 /Documentation/howto/revert-a-faulty-merge.txt
parentsetup: do not forget working dir from subdir of gitdir (diff)
downloadtgif-3f8099fce7779631fe8827a8979d7b57629a36de.tar.xz
Revert "rehabilitate 'git index-pack' inside the object store"
Now setup_git_directory_gently behaves sanely even from subdirs of .git, so simplify index-pack by no longer protecting against that. This reverts commit a672ea6ac5a1b876bc7adfe6534b16fa2a32c94b (excluding tests). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions