summaryrefslogtreecommitdiff
path: root/mergetools/diffuse
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-15 15:43:51 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-15 15:43:51 -0700
commit1018f3eea40875843ece4131e662ec3e32a3ab06 (patch)
treede0d7fd953157850734daa515cdc310f1aed07e6 /mergetools/diffuse
parentdb5adf24bf6e0380d4b4ce97f88b4f874773f424 (diff)
parent14886b40c552d3ad4d5492d922948d76762af198 (diff)
downloadgit-1018f3eea40875843ece4131e662ec3e32a3ab06.tar.gz
Merge branch 'js/gc-with-stale-symref'
"git gc" used to barf when a symbolic ref has gone dangling (e.g. the branch that used to be your upstream's default when you cloned from it is now gone, and you did "fetch --prune"). * js/gc-with-stale-symref: pack-objects: do not get distracted by broken symrefs gc: demonstrate failure with stale remote HEAD
Diffstat (limited to 'mergetools/diffuse')
0 files changed, 0 insertions, 0 deletions