diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-20 15:22:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-20 15:22:42 -0700 |
| commit | b05c2f9ed48adfd9670b28ecdd5c55a4e4698704 (patch) | |
| tree | 6392e6bbfc2cf79e3e8a9b3cac10149310e94226 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | Merge branch 'rd/test-path-utils' into maint (diff) | |
| parent | pack-objects: do not get distracted by broken symrefs (diff) | |
| download | tgif-b05c2f9ed48adfd9670b28ecdd5c55a4e4698704.tar.xz | |
Merge branch 'js/gc-with-stale-symref' into maint
"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 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions