diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:09:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-29 22:09:48 -0700 |
| commit | 5b830a8588f7d20a18e9ce7c886085ddfd7127d7 (patch) | |
| tree | 404386fc052756d02ea1489914752db51c5d5df3 /userdiff.h | |
| parent | Merge branch 'jk/index-pack-threading-races' into maint (diff) | |
| parent | fast-import: fix segfault in store_tree() (diff) | |
| download | tgif-5b830a8588f7d20a18e9ce7c886085ddfd7127d7.tar.xz | |
Merge branch 'mb/fast-import-delete-root' into maint
An attempt to remove the entire tree in the "git fast-import" input
stream caused it to misbehave.
* mb/fast-import-delete-root:
fast-import: fix segfault in store_tree()
t9300: test filedelete command
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions