diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:29:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-07 13:29:16 -0700 |
| commit | 5543501ced8e3303b7612b068831a111af0ab8b7 (patch) | |
| tree | 4b97699842f6f81a38e34235ed85a8041623e2c0 /builtin/merge.c | |
| parent | Merge branch 'zj/diff-empty-chmod' (diff) | |
| parent | git cherry-pick: do not dereference a potential NULL pointer (diff) | |
| download | tgif-5543501ced8e3303b7612b068831a111af0ab8b7.tar.xz | |
Merge branch 'nh/empty-rebase'
By Neil Horman
* nh/empty-rebase:
git cherry-pick: do not dereference a potential NULL pointer
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions