aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-06 12:44:01 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-06 12:44:01 -0800
commit1067f8dd0eef81062f740ba4bc680ac9649a0d42 (patch)
tree345dd16fb46de3db319cae484e2c2bf4bdca25c1 /builtin/merge.c
parent8cbfc1189cfc23f96f797a64bcb0c050b6ecc6e6 (diff)
parent96890f4c428ed62cf52c11aba5773d364a8d6234 (diff)
downloadgit-1067f8dd0eef81062f740ba4bc680ac9649a0d42.tar.gz
git-1067f8dd0eef81062f740ba4bc680ac9649a0d42.tar.xz
Merge branch 'jh/fetch-head-update'
* jh/fetch-head-update: write first for-merge ref to FETCH_HEAD first
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions