summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-12-05 20:02:42 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-10 16:14:17 -0800
commit48d25cae22667dfc2c31ad620172c0f0a3ac1490 (patch)
tree9e757eeeff528d48a7184c72675f838361537a42 /builtin/reset.c
parentupload-pack: make sure deepening preserves shallow roots (diff)
downloadtgif-48d25cae22667dfc2c31ad620172c0f0a3ac1490.tar.xz
fetch: add --update-shallow to accept refs that update .git/shallow
The same steps are done as in when --update-shallow is not given. The only difference is we now add all shallow commits in "ours" and "theirs" to .git/shallow (aka "step 8"). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
0 files changed, 0 insertions, 0 deletions